generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed cmake issues

Browse Source
This commit is contained in:
Maksim Shabunin 2015-02-18 12:44:48 +03:00
parent 553020c448
commit c41db69f98
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

@ -663,7 +663,7 @@ macro(_ocv_create_module)
set(sub_objs "") set(sub_objs "")
set(sub_links "") set(sub_links "")
set(cuda_objs "") set(cuda_objs "")
if (DEFINED OPENCV_MODULE_${the_module}_CHILDREN) if (OPENCV_MODULE_${the_module}_CHILDREN)
status("Complex module ${the_module}") status("Complex module ${the_module}")
foreach (m ${OPENCV_MODULE_${the_module}_CHILDREN}) foreach (m ${OPENCV_MODULE_${the_module}_CHILDREN})
if (BUILD_${m} AND TARGET ${m}_object) # ambigous? if (BUILD_${m} AND TARGET ${m}_object) # ambigous?
@ -765,7 +765,9 @@ macro(_ocv_create_module)
if (TARGET ${the_module}_object) if (TARGET ${the_module}_object)
# copy COMPILE_DEFINITIONS # copy COMPILE_DEFINITIONS
get_target_property(main_defs ${the_module} COMPILE_DEFINITIONS) get_target_property(main_defs ${the_module} COMPILE_DEFINITIONS)
set_target_properties(${the_module}_object PROPERTIES COMPILE_DEFINITIONS ${main_defs}) if (main_defs)
set_target_properties(${the_module}_object PROPERTIES COMPILE_DEFINITIONS ${main_defs})
endif()
# use same PCH # use same PCH
if (TARGET pch_Generate_${the_module}) if (TARGET pch_Generate_${the_module})
add_dependencies(${the_module}_object pch_Generate_${the_module} ) add_dependencies(${the_module}_object pch_Generate_${the_module} )