Merge pull request #1162 from jet47:cudev-integration
authorRoman Donchenko <roman.donchenko@itseez.com>
Wed, 14 Aug 2013 08:00:33 +0000 (12:00 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Wed, 14 Aug 2013 08:00:34 +0000 (12:00 +0400)
1  2 
modules/core/CMakeLists.txt

@@@ -1,13 -1,9 +1,13 @@@
  set(the_description "The Core Functionality")
- ocv_add_module(core ${ZLIB_LIBRARIES})
+ ocv_add_module(core ${ZLIB_LIBRARIES} OPTIONAL opencv_cudev)
  ocv_module_include_directories(${ZLIB_INCLUDE_DIR})
  
 +if (HAVE_WINRT)
 +    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /ZW /GS /Gm- /AI\"${WINDOWS_SDK_PATH}/References/CommonConfiguration/Neutral\" /AI\"${VISUAL_STUDIO_PATH}/vcpackages\"")
 +endif()
 +
  if(HAVE_CUDA)
-   ocv_warnings_disable(CMAKE_CXX_FLAGS -Wundef)
+   ocv_warnings_disable(CMAKE_CXX_FLAGS -Wundef -Wenum-compare -Wunused-function)
  endif()
  
  file(GLOB lib_cuda_hdrs        "include/opencv2/${name}/cuda/*.hpp"        "include/opencv2/${name}/cuda/*.h")