From 7e91e1871ddba11357c2c3f690e75c8a91de7f40 Mon Sep 17 00:00:00 2001 From: Vladislav Vinogradov Date: Wed, 17 Apr 2013 17:54:39 +0400 Subject: [PATCH] simplify CMakeLists.txt for gpu module --- modules/gpu/CMakeLists.txt | 59 ++------------------------------------ modules/gpu/perf4au/CMakeLists.txt | 1 - 2 files changed, 3 insertions(+), 57 deletions(-) diff --git a/modules/gpu/CMakeLists.txt b/modules/gpu/CMakeLists.txt index 55faa39..de132cf 100644 --- a/modules/gpu/CMakeLists.txt +++ b/modules/gpu/CMakeLists.txt @@ -4,63 +4,10 @@ endif() set(the_description "GPU-accelerated Computer Vision") -ocv_add_module(gpu opencv_imgproc opencv_calib3d opencv_objdetect opencv_video opencv_photo opencv_legacy - opencv_gpuarithm opencv_gpufilters opencv_gpuimgproc opencv_gpufeatures2d opencv_gpuvideo opencv_gpucalib3d opencv_gpuobjdetect - OPTIONAL opencv_gpunvidia) +ocv_warnings_disable(CMAKE_CXX_FLAGS -Wundef -Wmissing-declarations -Wshadow -Wunused-parameter) -ocv_module_include_directories("${CMAKE_CURRENT_SOURCE_DIR}/src/cuda") - -file(GLOB lib_hdrs "include/opencv2/*.hpp" "include/opencv2/${name}/*.hpp" "include/opencv2/${name}/*.h") -file(GLOB lib_int_hdrs "src/*.hpp" "src/*.h") -file(GLOB lib_cuda_hdrs "src/cuda/*.hpp" "src/cuda/*.h") -file(GLOB lib_srcs "src/*.cpp") -file(GLOB lib_cuda "src/cuda/*.cu*") - -source_group("Include" FILES ${lib_hdrs}) -source_group("Src\\Host" FILES ${lib_srcs} ${lib_int_hdrs}) -source_group("Src\\Cuda" FILES ${lib_cuda} ${lib_cuda_hdrs}) - -if(HAVE_CUDA) - ocv_include_directories(${CUDA_INCLUDE_DIRS}) - ocv_warnings_disable(CMAKE_CXX_FLAGS -Wundef -Wmissing-declarations -Wshadow -Wunused-parameter /wd4211 /wd4201 /wd4100 /wd4505 /wd4408) - - if(MSVC) - if(NOT ENABLE_NOISY_WARNINGS) - foreach(var CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_RELEASE CMAKE_CXX_FLAGS_DEBUG) - string(REPLACE "/W4" "/W3" ${var} "${${var}}") - endforeach() - - set(CUDA_NVCC_FLAGS ${CUDA_NVCC_FLAGS} -Xcompiler /wd4251) - endif() - endif() - - ocv_cuda_compile(cuda_objs ${lib_cuda} ${ncv_cuda}) - - set(cuda_link_libs ${CUDA_LIBRARIES} ${CUDA_npp_LIBRARY}) -else() - set(lib_cuda "") - set(cuda_objs "") - set(cuda_link_libs "") -endif() - -ocv_set_module_sources( - HEADERS ${lib_hdrs} - SOURCES ${lib_int_hdrs} ${lib_cuda_hdrs} ${lib_srcs} ${lib_cuda} ${cuda_objs} - ) - -ocv_create_module(${cuda_link_libs}) - -ocv_add_precompiled_headers(${the_module}) - -################################################################################################################ -################################ GPU Module Tests ##################################################### -################################################################################################################ -file(GLOB test_srcs "test/*.cpp") -file(GLOB test_hdrs "test/*.hpp" "test/*.h") - -ocv_add_accuracy_tests(FILES "Include" ${test_hdrs} - FILES "Src" ${test_srcs}) -ocv_add_perf_tests() +ocv_define_module(gpu opencv_gpuarithm opencv_gpufilters opencv_gpuimgproc + opencv_gpufeatures2d opencv_gpuvideo opencv_gpucalib3d opencv_gpuobjdetect) if(HAVE_CUDA) add_subdirectory(perf4au) diff --git a/modules/gpu/perf4au/CMakeLists.txt b/modules/gpu/perf4au/CMakeLists.txt index 7452203..376e7b2 100644 --- a/modules/gpu/perf4au/CMakeLists.txt +++ b/modules/gpu/perf4au/CMakeLists.txt @@ -25,4 +25,3 @@ if(WIN32) set_target_properties(${the_target} PROPERTIES LINK_FLAGS "/NODEFAULTLIB:atlthunk.lib /NODEFAULTLIB:atlsd.lib /DEBUG") endif() endif() - -- 2.7.4