Merge pull request #1487 from alalek:fix_add_definitions

43485a21 · Alexander Smorkalov · OpenCV Buildbot · 02247de3 · 286244ef · 43485a21
Commit 43485a21 authored Sep 23, 2013 by Alexander Smorkalov Committed by OpenCV Buildbot Sep 23, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 5 deletions

OpenCVModule.cmake cmake/OpenCVModule.cmake +1 -5

No files found.
--- a/cmake/OpenCVModule.cmake
+++ b/cmake/OpenCVModule.cmake
@@ -519,11 +519,7 @@ macro(ocv_create_module)

  if((NOT DEFINED OPENCV_MODULE_TYPE AND BUILD_SHARED_LIBS)
      OR (DEFINED OPENCV_MODULE_TYPE AND OPENCV_MODULE_TYPE STREQUAL SHARED))
-    if(MSVC)
-      set_target_properties(${the_module} PROPERTIES DEFINE_SYMBOL CVAPI_EXPORTS)
-    else()
-      add_definitions(-DCVAPI_EXPORTS)
-    endif()
+    set_target_properties(${the_module} PROPERTIES DEFINE_SYMBOL CVAPI_EXPORTS)
  endif()

  if(MSVC)