From ada9158521b03867e37655c6f6b03c04a7308279 Mon Sep 17 00:00:00 2001 From: Alexey Spizhevoy Date: Thu, 2 Feb 2012 14:06:13 +0000 Subject: [PATCH] Fixed the building process for (ubuntu 64bit debug cuda4.1) configuration --- cmake/OpenCVModule.cmake | 7 ++++++- modules/gpu/CMakeLists.txt | 7 +++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/cmake/OpenCVModule.cmake b/cmake/OpenCVModule.cmake index 031424b..4947945 100644 --- a/cmake/OpenCVModule.cmake +++ b/cmake/OpenCVModule.cmake @@ -237,8 +237,13 @@ macro(define_opencv_moduleEx _name _visibility) #set (CUDA_NVCC_FLAGS ${CUDA_NVCC_FLAGS} "-keep") #set (CUDA_NVCC_FLAGS ${CUDA_NVCC_FLAGS} "-Xcompiler;/EHsc-;") - + + # we remove -ggdb3 flag as it leads to preprocessor errors when compiling CUDA files (CUDA 4.1) + set(tmp ${CMAKE_CXX_FLAGS_DEBUG}) + string(REPLACE "-ggdb3" "" CMAKE_CXX_FLAGS_DEBUG ${CMAKE_CXX_FLAGS_DEBUG}) CUDA_COMPILE(cuda_objs ${lib_cuda}) + set(CMAKE_CXX_DEBUG_FLAGS ${tmp}) + else() set(lib_cuda "") set(cuda_objs "") diff --git a/modules/gpu/CMakeLists.txt b/modules/gpu/CMakeLists.txt index 8bc4446..3f0b98e 100644 --- a/modules/gpu/CMakeLists.txt +++ b/modules/gpu/CMakeLists.txt @@ -85,7 +85,14 @@ if (HAVE_CUDA) set(CUDA_NVCC_FLAGS ${CUDA_NVCC_FLAGS} "-Xcompiler;/wd4251") endif() + + + # we remove -ggdb3 flag as it leads to preprocessor errors when compiling CUDA files (CUDA 4.1) + set(tmp ${CMAKE_CXX_FLAGS_DEBUG}) + string(REPLACE "-ggdb3" "" CMAKE_CXX_FLAGS_DEBUG ${CMAKE_CXX_FLAGS_DEBUG}) CUDA_COMPILE(cuda_objs ${lib_cuda} ${ncv_cuda}) + set(CMAKE_CXX_DEBUG_FLAGS ${tmp}) + #CUDA_BUILD_CLEAN_TARGET() endif() -- 2.7.4