Merge pull request #1498 from alalek:revert_1487

887ff0de · Alexander Smorkalov · OpenCV Buildbot · 6057414a · ce557fb7 · 887ff0de
Commit 887ff0de authored Sep 25, 2013 by Alexander Smorkalov Committed by OpenCV Buildbot Sep 25, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

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

No files found.
--- a/cmake/OpenCVModule.cmake
+++ b/cmake/OpenCVModule.cmake
@@ -519,7 +519,11 @@ 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))
-    set_target_properties(${the_module} PROPERTIES DEFINE_SYMBOL CVAPI_EXPORTS)
+    if(MSVC)
+      set_target_properties(${the_module} PROPERTIES DEFINE_SYMBOL CVAPI_EXPORTS)
+    else()
+      add_definitions(-DCVAPI_EXPORTS)
+    endif()
  endif()

  if(MSVC)