moved SURF_GPU and VIBE to gpunonfree module
This commit is contained in:
@@ -16,10 +16,14 @@ if(BUILD_EXAMPLES AND OCV_DEPENDENCIES_FOUND)
|
||||
ocv_include_directories("${OpenCV_SOURCE_DIR}/include")#for opencv.hpp
|
||||
ocv_include_modules(${OPENCV_CPP_SAMPLES_REQUIRED_DEPS})
|
||||
|
||||
if (HAVE_opencv_gpu)
|
||||
if(HAVE_opencv_gpu)
|
||||
ocv_include_directories("${OpenCV_SOURCE_DIR}/modules/gpu/include")
|
||||
endif()
|
||||
|
||||
if(HAVE_opencv_gpunonfree)
|
||||
ocv_include_directories("${OpenCV_SOURCE_DIR}/modules/gpunonfree/include")
|
||||
endif()
|
||||
|
||||
if(CMAKE_COMPILER_IS_GNUCXX AND NOT ENABLE_NOISY_WARNINGS)
|
||||
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-function")
|
||||
endif()
|
||||
@@ -41,9 +45,12 @@ if(BUILD_EXAMPLES AND OCV_DEPENDENCIES_FOUND)
|
||||
add_executable(${the_target} ${srcs})
|
||||
target_link_libraries(${the_target} ${OPENCV_LINKER_LIBS} ${OPENCV_CPP_SAMPLES_REQUIRED_DEPS})
|
||||
|
||||
if (HAVE_opencv_gpu)
|
||||
if(HAVE_opencv_gpu)
|
||||
target_link_libraries(${the_target} opencv_gpu)
|
||||
endif()
|
||||
if(HAVE_opencv_gpunonfree)
|
||||
target_link_libraries(${the_target} opencv_gpunonfree)
|
||||
endif()
|
||||
|
||||
set_target_properties(${the_target} PROPERTIES
|
||||
OUTPUT_NAME "cpp-${sample_kind}-${name}"
|
||||
|
Reference in New Issue
Block a user