提交 2e608b1c 编写于 作者: A Alexander Alekhin 提交者: GitHub

Merge pull request #9306 from alalek:cmake_fix_macro

cmake: fix __STDC macros for opencv_world build
......@@ -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})
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)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册