From 5e32de81736b70b041befc956c538938c3b1e32a Mon Sep 17 00:00:00 2001 From: Alexander Alekhin Date: Thu, 3 Aug 2017 18:40:05 +0300 Subject: [PATCH] cmake: fix __STDC macros for opencv_world build --- cmake/OpenCVModule.cmake | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/cmake/OpenCVModule.cmake b/cmake/OpenCVModule.cmake index 48b3b41..ea85e21 100644 --- 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) -- 2.7.4