From 9470ad050bddd03b2ac0c3072d6df8e7aeb4c195 Mon Sep 17 00:00:00 2001
From: Jonathan G Rennison <j.g.rennison@gmail.com>
Date: Sat, 27 Jun 2020 19:10:11 +0100
Subject: [PATCH] CMake: Fix configure defines

---
 CMakeLists.txt   | 28 ++++++++++++++++++----------
 src/crashlog.cpp |  2 --
 src/rev.cpp.in   |  8 +-------
 src/rev.h        |  1 -
 4 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c3be256df0..bde7183e7a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -120,16 +120,6 @@ if (WIN32)
     list(APPEND GENERATED_SOURCE_FILES "${CMAKE_BINARY_DIR}/generated/ottdres.rc")
 endif (WIN32)
 
-# Generate a target to determine version, which is execute every 'make' run
-add_custom_target(find_version
-        ${CMAKE_COMMAND}
-                -DFIND_VERSION_BINARY_DIR=${CMAKE_BINARY_DIR}/generated
-                -DCPACK_BINARY_DIR=${CMAKE_BINARY_DIR}
-                -P "${CMAKE_SOURCE_DIR}/cmake/scripts/FindVersion.cmake"
-        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-        BYPRODUCTS ${GENERATED_SOURCE_FILES}
-)
-
 include(SourceList)
 include(Endian)
 add_endian_definition()
@@ -253,3 +243,21 @@ include(CreateRegression)
 create_regression()
 
 include(InstallAndPackage)
+
+get_property(CFG_DEFS DIRECTORY . PROPERTY COMPILE_OPTIONS)
+list(FILTER CFG_DEFS INCLUDE REGEX "^-D")
+list(TRANSFORM CFG_DEFS REPLACE "^-D" "")
+get_property(CFG_DEFS_2 DIRECTORY . PROPERTY COMPILE_DEFINITIONS)
+list(APPEND CFG_DEFS ${CFG_DEFS_2})
+list(FILTER CFG_DEFS EXCLUDE REGEX "_DIR=")
+
+# Generate a target to determine version, which is execute every 'make' run
+add_custom_target(find_version
+        ${CMAKE_COMMAND}
+                -DFIND_VERSION_BINARY_DIR=${CMAKE_BINARY_DIR}/generated
+                -DCPACK_BINARY_DIR=${CMAKE_BINARY_DIR}
+                -DCONFIGURE_DEFINES="${CFG_DEFS}"
+                -P "${CMAKE_SOURCE_DIR}/cmake/scripts/FindVersion.cmake"
+        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+        BYPRODUCTS ${GENERATED_SOURCE_FILES}
+)
diff --git a/src/crashlog.cpp b/src/crashlog.cpp
index 066e285864..a03a10fa22 100644
--- a/src/crashlog.cpp
+++ b/src/crashlog.cpp
@@ -144,7 +144,6 @@ char *CrashLog::LogOpenTTDVersion(char *buffer, const char *last) const
 			" Endian:     %s\n"
 			" Dedicated:  %s\n"
 			" Build date: %s\n"
-			" Configure:  %s\n"
 			" Defines:    %s\n\n",
 			_openttd_revision,
 			_openttd_revision_modified,
@@ -165,7 +164,6 @@ char *CrashLog::LogOpenTTDVersion(char *buffer, const char *last) const
 			"no",
 #endif
 			_openttd_build_date,
-			_openttd_build_configure,
 			_openttd_build_configure_defines
 	);
 }
diff --git a/src/rev.cpp.in b/src/rev.cpp.in
index cabb19ce4c..69db783d23 100644
--- a/src/rev.cpp.in
+++ b/src/rev.cpp.in
@@ -45,16 +45,10 @@ const char _openttd_revision[] = "${REV_VERSION}";
  */
 const char _openttd_build_date[] = __DATE__ " " __TIME__;
 
-
-/**
- * The configure invocation used to build OpenTTD
- */
-const char _openttd_build_configure[] = "!!CONFIGURE_INVOCATION!!";
-
 /**
  * The configure defines used to build OpenTTD
  */
-const char _openttd_build_configure_defines[] = "!!CONFIGURE_DEFINES!!";
+const char _openttd_build_configure_defines[] = "${CONFIGURE_DEFINES}";
 
 /**
  * The git revision hash of this version.
diff --git a/src/rev.h b/src/rev.h
index e9a4c8ecf3..26af163527 100644
--- a/src/rev.h
+++ b/src/rev.h
@@ -14,7 +14,6 @@ extern const char _openttd_revision[];
 extern const char _openttd_build_date[];
 extern const char _openttd_revision_hash[];
 extern const char _openttd_revision_year[];
-extern const char _openttd_build_configure[];
 extern const char _openttd_build_configure_defines[];
 extern const byte _openttd_revision_modified;
 extern const byte _openttd_revision_tagged;