Merge pull request #9306 from alalek:cmake_fix_macro

cmake: fix __STDC macros for opencv_world build
7 years ago · 2e608b1c97
parent dcc63d7408 5e32de8173
commit 2e608b1c97
1 changed files with 4 additions and 2 deletions
--- a/cmake/OpenCVModule.cmake
+++ b/cmake/OpenCVModule.cmake
@ -223,8 +223,10 @@ macro(ocv_add_module _name)
    if(NOT BUILD_${the_module})
      return() # extra protection from redefinition
    endif()
-    if((NOT OPENCV_MODULE_${the_module}_IS_PART_OF_WORLD AND NOT ${the_module} STREQUAL opencv_world) OR NOT ${BUILD_opencv_world})
-      project(${the_module})
+    if(NOT OPENCV_MODULE_${the_module}_IS_PART_OF_WORLD OR NOT ${BUILD_opencv_world})
+      if (NOT ${the_module} STREQUAL opencv_world)
+        project(${the_module})
+      endif()
      add_definitions(
        -D_USE_MATH_DEFINES  # M_PI constant in MSVS
        -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS -D__STDC_FORMAT_MACROS  # to use C libraries from C++ code (ffmpeg)