dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CMake: Fix compilation on CMake < 3.12

Browse Source 
Bump minimum version to 3.6
This commit is contained in:
Jonathan G Rennison
2020-07-13 21:20:17 +01:00
parent 05dc785f13
commit 68f216cad6
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.5) cmake_minimum_required(VERSION 3.6)
if (NOT BINARY_NAME) if (NOT BINARY_NAME)
set(BINARY_NAME openttd) set(BINARY_NAME openttd)
@@ -307,7 +307,11 @@ include(InstallAndPackage)
get_property(CFG_DEFS DIRECTORY . PROPERTY COMPILE_OPTIONS) get_property(CFG_DEFS DIRECTORY . PROPERTY COMPILE_OPTIONS)
list(FILTER CFG_DEFS INCLUDE REGEX "^-D") list(FILTER CFG_DEFS INCLUDE REGEX "^-D")
list(TRANSFORM CFG_DEFS REPLACE "^-D" "")
# list TRANSFORM requires 3.12 or later
#list(TRANSFORM CFG_DEFS REPLACE "^-D" "")
string(REGEX REPLACE "(^|;)-D" "\\1" CFG_DEFS "${CFG_DEFS}")
get_property(CFG_DEFS_2 DIRECTORY . PROPERTY COMPILE_DEFINITIONS) get_property(CFG_DEFS_2 DIRECTORY . PROPERTY COMPILE_DEFINITIONS)
list(APPEND CFG_DEFS ${CFG_DEFS_2}) list(APPEND CFG_DEFS ${CFG_DEFS_2})
list(FILTER CFG_DEFS EXCLUDE REGEX "_DIR=") list(FILTER CFG_DEFS EXCLUDE REGEX "_DIR=")