From 68f216cad6ee3ebf30aba27a4d98d0ee26e7120f Mon Sep 17 00:00:00 2001 From: Jonathan G Rennison Date: Mon, 13 Jul 2020 21:20:17 +0100 Subject: [PATCH] CMake: Fix compilation on CMake < 3.12 Bump minimum version to 3.6 --- CMakeLists.txt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2d26382b08..55a1b2aedb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.6) if (NOT BINARY_NAME) set(BINARY_NAME openttd) @@ -307,7 +307,11 @@ include(InstallAndPackage) get_property(CFG_DEFS DIRECTORY . PROPERTY COMPILE_OPTIONS) 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) list(APPEND CFG_DEFS ${CFG_DEFS_2}) list(FILTER CFG_DEFS EXCLUDE REGEX "_DIR=")