mirror of https://github.com/OpenTTD/OpenTTD
Codefix: remove unused set/process_compile_flags from CMake system
parent
984da2455b
commit
cf05b6c2f8
|
@ -299,7 +299,6 @@ if(IPO_FOUND)
|
||||||
set_target_properties(openttd PROPERTIES INTERPROCEDURAL_OPTIMIZATION_RELWITHDEBINFO True)
|
set_target_properties(openttd PROPERTIES INTERPROCEDURAL_OPTIMIZATION_RELWITHDEBINFO True)
|
||||||
endif()
|
endif()
|
||||||
set_target_properties(openttd PROPERTIES VS_DEBUGGER_WORKING_DIRECTORY "${CMAKE_BINARY_DIR}")
|
set_target_properties(openttd PROPERTIES VS_DEBUGGER_WORKING_DIRECTORY "${CMAKE_BINARY_DIR}")
|
||||||
process_compile_flags()
|
|
||||||
|
|
||||||
include(LinkPackage)
|
include(LinkPackage)
|
||||||
link_package(PNG TARGET PNG::PNG ENCOURAGED)
|
link_package(PNG TARGET PNG::PNG ENCOURAGED)
|
||||||
|
|
|
@ -46,44 +46,3 @@ endfunction()
|
||||||
function(add_test_files)
|
function(add_test_files)
|
||||||
_add_files_tgt(openttd_test ${ARGV})
|
_add_files_tgt(openttd_test ${ARGV})
|
||||||
endfunction()
|
endfunction()
|
||||||
|
|
||||||
# This function works around an 'issue' with CMake, where
|
|
||||||
# set_source_files_properties() only works in the scope of the file. We want
|
|
||||||
# to set properties for the source file on a more global level. To solve this,
|
|
||||||
# this function records the flags you want, and a macro adds them in the root
|
|
||||||
# CMakeLists.txt.
|
|
||||||
# See this URL for more information on the issue:
|
|
||||||
# http://cmake.3232098.n2.nabble.com/scope-of-set-source-files-properties-td4766111.html
|
|
||||||
#
|
|
||||||
# set_compile_flags([file1 ...] COMPILE_FLAGS cflag [cflag ...])
|
|
||||||
#
|
|
||||||
function(set_compile_flags)
|
|
||||||
cmake_parse_arguments(PARAM "" "" "COMPILE_FLAGS" ${ARGN})
|
|
||||||
set(PARAM_FILES "${PARAM_UNPARSED_ARGUMENTS}")
|
|
||||||
|
|
||||||
get_property(SOURCE_PROPERTIES GLOBAL PROPERTY source_properties)
|
|
||||||
|
|
||||||
foreach(FILE IN LISTS PARAM_FILES)
|
|
||||||
list(APPEND SOURCE_PROPERTIES "${CMAKE_CURRENT_SOURCE_DIR}/${FILE}::${PARAM_COMPILE_FLAGS}")
|
|
||||||
endforeach()
|
|
||||||
|
|
||||||
set_property(GLOBAL PROPERTY source_properties "${SOURCE_PROPERTIES}")
|
|
||||||
endfunction()
|
|
||||||
|
|
||||||
# Call this macro in the same CMakeLists.txt and after add_executable().
|
|
||||||
# This makes sure all the COMPILE_FLAGS of set_compile_flags() are set
|
|
||||||
# correctly.
|
|
||||||
#
|
|
||||||
# process_compile_flags()
|
|
||||||
#
|
|
||||||
function(process_compile_flags)
|
|
||||||
get_property(SOURCE_PROPERTIES GLOBAL PROPERTY source_properties)
|
|
||||||
|
|
||||||
foreach(ENTRY ${SOURCE_PROPERTIES})
|
|
||||||
string(REPLACE "::" ";" ENTRY "${ENTRY}")
|
|
||||||
list(GET ENTRY 0 FILE)
|
|
||||||
list(GET ENTRY 1 PROPERTIES)
|
|
||||||
|
|
||||||
set_source_files_properties(${FILE} PROPERTIES COMPILE_FLAGS ${PROPERTIES})
|
|
||||||
endforeach()
|
|
||||||
endfunction()
|
|
||||||
|
|
Loading…
Reference in New Issue