mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-28 05:06:29 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

cmake: fix __STDC macros for opencv_world build

Browse Source
This commit is contained in:
Alexander Alekhin 2017-08-03 18:40:05 +03:00
parent 2f4a3e40eb
commit 5e32de8173
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmake/OpenCVModule.cmake
View File

@ -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)