generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

moved device layer headers to include directory

Browse Source
This commit is contained in:
Vladislav Vinogradov 2012-10-05 18:04:23 +04:00
parent 3ebec7448d
commit ab3a5244ba
28 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/core/CMakeLists.txt
View File

@ -4,7 +4,7 @@ ocv_module_include_directories(${ZLIB_INCLUDE_DIR})
if(HAVE_CUDA) if(HAVE_CUDA)
ocv_source_group("Src\\Cuda" GLOB "src/cuda/*.cu") ocv_source_group("Src\\Cuda" GLOB "src/cuda/*.cu")
ocv_include_directories("${OpenCV_SOURCE_DIR}/modules/gpu/src" "${OpenCV_SOURCE_DIR}/modules/gpu/src/cuda" ${CUDA_INCLUDE_DIRS}) ocv_include_directories("${OpenCV_SOURCE_DIR}/modules/gpu/include" ${CUDA_INCLUDE_DIRS})
ocv_warnings_disable(CMAKE_CXX_FLAGS -Wundef) ocv_warnings_disable(CMAKE_CXX_FLAGS -Wundef)
file(GLOB lib_cuda "src/cuda/*.cu") file(GLOB lib_cuda "src/cuda/*.cu")

12
modules/gpu/CMakeLists.txt
View File

@ -7,11 +7,11 @@ ocv_add_module(gpu opencv_imgproc opencv_calib3d opencv_objdetect opencv_video o
ocv_module_include_directories("${CMAKE_CURRENT_SOURCE_DIR}/src/cuda" "${CMAKE_CURRENT_SOURCE_DIR}/../highgui/src") ocv_module_include_directories("${CMAKE_CURRENT_SOURCE_DIR}/src/cuda" "${CMAKE_CURRENT_SOURCE_DIR}/../highgui/src")
file(GLOB lib_hdrs "include/opencv2/${name}/*.hpp" "include/opencv2/${name}/*.h") file(GLOB lib_hdrs "include/opencv2/${name}/*.hpp" "include/opencv2/${name}/*.h")
file(GLOB lib_int_hdrs "src/*.hpp" "src/*.h") file(GLOB lib_device_hdrs "include/opencv2/${name}/device/*.hpp" "include/opencv2/${name}/device/*.h")
file(GLOB lib_device_hdrs_detail "include/opencv2/${name}/device/detail/*.hpp" "include/opencv2/${name}/device/detail/*.h")
file(GLOB lib_int_hdrs "src/*.hpp" "src/*.h")
file(GLOB lib_cuda_hdrs "src/cuda/*.hpp" "src/cuda/*.h") file(GLOB lib_cuda_hdrs "src/cuda/*.hpp" "src/cuda/*.h")
file(GLOB lib_device_hdrs "src/opencv2/gpu/device/*.hpp" "src/opencv2/gpu/device/*.h")
file(GLOB lib_device_hdrs_detail "src/opencv2/gpu/device/detail/*.hpp" "src/opencv2/gpu/device/detail/*.h")
file(GLOB lib_srcs "src/*.cpp") file(GLOB lib_srcs "src/*.cpp")
file(GLOB lib_cuda "src/cuda/*.cu*") file(GLOB lib_cuda "src/cuda/*.cu*")
@ -74,8 +74,8 @@ else()
endif() endif()
ocv_set_module_sources( ocv_set_module_sources(
HEADERS ${lib_hdrs} HEADERS ${lib_hdrs} ${lib_device_hdrs} ${lib_device_hdrs_detail}
SOURCES ${lib_int_hdrs} ${lib_cuda_hdrs} ${lib_device_hdrs} ${lib_device_hdrs_detail} ${lib_srcs} ${lib_cuda} ${ncv_files} ${cuda_objs} SOURCES ${lib_int_hdrs} ${lib_cuda_hdrs} ${lib_srcs} ${lib_cuda} ${ncv_files} ${cuda_objs}
) )
ocv_create_module(${cuda_link_libs}) ocv_create_module(${cuda_link_libs})

0
modules/gpu/src/opencv2/gpu/device/border_interpolate.hpp → modules/gpu/include/opencv2/gpu/device/border_interpolate.hpp
View File

0
modules/gpu/src/opencv2/gpu/device/color.hpp → modules/gpu/include/opencv2/gpu/device/color.hpp
View File

0
modules/gpu/src/opencv2/gpu/device/common.hpp → modules/gpu/include/opencv2/gpu/device/common.hpp
View File

0
modules/gpu/src/opencv2/gpu/device/datamov_utils.hpp → modules/gpu/include/opencv2/gpu/device/datamov_utils.hpp
View File

0
modules/gpu/src/opencv2/gpu/device/detail/color_detail.hpp → modules/gpu/include/opencv2/gpu/device/detail/color_detail.hpp
View File

0
modules/gpu/src/opencv2/gpu/device/detail/reduction_detail.hpp → modules/gpu/include/opencv2/gpu/device/detail/reduction_detail.hpp
View File

0
modules/gpu/src/opencv2/gpu/device/detail/transform_detail.hpp → modules/gpu/include/opencv2/gpu/device/detail/transform_detail.hpp
View File

0
modules/gpu/src/opencv2/gpu/device/detail/type_traits_detail.hpp → modules/gpu/include/opencv2/gpu/device/detail/type_traits_detail.hpp
View File

0
modules/gpu/src/opencv2/gpu/device/detail/vec_distance_detail.hpp → modules/gpu/include/opencv2/gpu/device/detail/vec_distance_detail.hpp
View File

0
modules/gpu/src/opencv2/gpu/device/dynamic_smem.hpp → modules/gpu/include/opencv2/gpu/device/dynamic_smem.hpp
View File

0
modules/gpu/src/opencv2/gpu/device/emulation.hpp → modules/gpu/include/opencv2/gpu/device/emulation.hpp
View File

0
modules/gpu/src/opencv2/gpu/device/filters.hpp → modules/gpu/include/opencv2/gpu/device/filters.hpp
View File

0
modules/gpu/src/opencv2/gpu/device/funcattrib.hpp → modules/gpu/include/opencv2/gpu/device/funcattrib.hpp
View File

0
modules/gpu/src/opencv2/gpu/device/functional.hpp → modules/gpu/include/opencv2/gpu/device/functional.hpp
View File

0
modules/gpu/src/opencv2/gpu/device/limits.hpp → modules/gpu/include/opencv2/gpu/device/limits.hpp
View File

0
modules/gpu/src/opencv2/gpu/device/saturate_cast.hpp → modules/gpu/include/opencv2/gpu/device/saturate_cast.hpp
View File

0
modules/gpu/src/opencv2/gpu/device/scan.hpp → modules/gpu/include/opencv2/gpu/device/scan.hpp
View File

0
modules/gpu/src/opencv2/gpu/device/static_check.hpp → modules/gpu/include/opencv2/gpu/device/static_check.hpp
View File

0
modules/gpu/src/opencv2/gpu/device/transform.hpp → modules/gpu/include/opencv2/gpu/device/transform.hpp
View File

0
modules/gpu/src/opencv2/gpu/device/type_traits.hpp → modules/gpu/include/opencv2/gpu/device/type_traits.hpp
View File

0
modules/gpu/src/opencv2/gpu/device/utility.hpp → modules/gpu/include/opencv2/gpu/device/utility.hpp
View File

0
modules/gpu/src/opencv2/gpu/device/vec_distance.hpp → modules/gpu/include/opencv2/gpu/device/vec_distance.hpp
View File

0
modules/gpu/src/opencv2/gpu/device/vec_math.hpp → modules/gpu/include/opencv2/gpu/device/vec_math.hpp
View File

0
modules/gpu/src/opencv2/gpu/device/vec_traits.hpp → modules/gpu/include/opencv2/gpu/device/vec_traits.hpp
View File

0
modules/gpu/src/opencv2/gpu/device/warp.hpp → modules/gpu/include/opencv2/gpu/device/warp.hpp
View File

0
modules/gpu/src/opencv2/gpu/device/warp_reduce.hpp → modules/gpu/include/opencv2/gpu/device/warp_reduce.hpp
View File