mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-13 04:52:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

cmake: fix GCC precompiled headers warnings

Browse Source
This commit is contained in:
Alexander Alekhin 2017-04-04 19:48:16 +03:00
parent d15d9f558d
commit 1f86d8564f
1 changed files with 7 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
cmake/OpenCVPCHSupport.cmake
View File

@ -196,18 +196,20 @@ MACRO(ADD_PRECOMPILED_HEADER_TO_TARGET _targetName _input _pch_output_to_use )
_PCH_GET_TARGET_COMPILE_FLAGS(_target_cflags ${_name} ${_pch_output_to_use} ${_dowarn}) _PCH_GET_TARGET_COMPILE_FLAGS(_target_cflags ${_name} ${_pch_output_to_use} ${_dowarn})
#MESSAGE("Add flags ${_target_cflags} to ${_targetName} " ) #MESSAGE("Add flags ${_target_cflags} to ${_targetName} " )
if(CMAKE_COMPILER_IS_GNUCXX)
set(_target_cflags "${_target_cflags} -include \"${CMAKE_CURRENT_BINARY_DIR}/${_name}\"")
endif()
GET_TARGET_PROPERTY(_sources ${_targetName} SOURCES) GET_TARGET_PROPERTY(_sources ${_targetName} SOURCES)
FOREACH(src ${_sources}) FOREACH(src ${_sources})
if(NOT "${src}" MATCHES "\\.mm$") if(NOT "${src}" MATCHES "\\.mm$")
get_source_file_property(_flags "${src}" COMPILE_FLAGS) get_source_file_property(_flags "${src}" COMPILE_FLAGS)
if(_flags) get_source_file_property(_flags2 "${src}" COMPILE_DEFINITIONS)
set(_flags "${_flags} ${_target_cflags}") if(NOT _flags AND NOT _flags2)
set_source_files_properties("${src}" PROPERTIES COMPILE_FLAGS "${_target_cflags}")
else() else()
set(_flags "${_target_cflags}") #ocv_debug_message("Skip PCH, flags: ${oldProps} defines: ${oldProps2}, file: ${src}")
endif() endif()
set_source_files_properties("${src}" PROPERTIES COMPILE_FLAGS "${_flags}")
endif() endif()
ENDFOREACH() ENDFOREACH()
@ -284,20 +286,6 @@ MACRO(ADD_PRECOMPILED_HEADER _targetName _input)
DEPENDS ${_targetName}_pch_dephelp DEPENDS ${_targetName}_pch_dephelp
) )
get_target_property(_sources ${_targetName} SOURCES)
foreach(src ${_sources})
if(NOT "${src}" MATCHES "\\.mm$")
get_source_file_property(oldProps "${src}" COMPILE_FLAGS)
get_source_file_property(oldProps2 "${src}" COMPILE_DEFINITIONS)
if(NOT oldProps AND NOT oldProps2)
set(newProperties "-include \"${CMAKE_CURRENT_BINARY_DIR}/${_name}\"")
set_source_files_properties("${src}" PROPERTIES COMPILE_FLAGS "${newProperties}")
else()
ocv_debug_message("Skip PCH, flags: ${oldProps} defines: ${oldProps2}, file: ${src}")
endif()
endif()
endforeach()
ADD_PRECOMPILED_HEADER_TO_TARGET(${_targetName} ${_input} ${_output} ${_dowarn}) ADD_PRECOMPILED_HEADER_TO_TARGET(${_targetName} ${_input} ${_output} ${_dowarn})
ENDMACRO(ADD_PRECOMPILED_HEADER) ENDMACRO(ADD_PRECOMPILED_HEADER)