potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-30 07:43:03 +04:00
Code Packages Releases Wiki Activity

Merge pull request #5969 from alalek:fix_cuda_world

Browse Source
This commit is contained in:
Alexander Alekhin
2016-01-15 06:57:19 +00:00
parent df89e76fb1 c8ff7a4867
commit 243c513eea
4 changed files with 9 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/cudev/CMakeLists.txt
+1 -1
View File
@@ -17,6 +17,6 @@ ocv_set_module_sources(HEADERS ${lib_hdrs} SOURCES ${lib_srcs})
ocv_create_module()
if(BUILD_TESTS)
if(BUILD_TESTS AND NOT BUILD_opencv_world)
add_subdirectory(test)
endif()
modules/world/CMakeLists.txt
+2 -2
View File
@@ -20,13 +20,13 @@ if(NOT OPENCV_INITIAL_PASS)
foreach(m ${OPENCV_MODULES_BUILD})
if(OPENCV_MODULE_${m}_IS_PART_OF_WORLD)
message(STATUS " module ${m}...")
set(CMAKE_CURRENT_SOURCE_DIR ${OPENCV_MODULE_${m}_LOCATION})
set(CMAKE_CURRENT_SOURCE_DIR "${OPENCV_MODULE_${m}_LOCATION}")
#add_subdirectory("${OPENCV_MODULE_${m}_LOCATION}" ${CMAKE_CURRENT_BINARY_DIR}/${m})
include_one_module(${m})
endif()
endforeach()
message(STATUS "Processing WORLD modules... DONE")
set(CMAKE_CURRENT_SOURCE_DIR OPENCV_MODULE_${opencv_world}_LOCATION)
set(CMAKE_CURRENT_SOURCE_DIR "${OPENCV_MODULE_opencv_world_LOCATION}")
endif()
ocv_add_module(world opencv_core)