Conditionally include gitversion.h

MegaGlest · Feb 20, 2025 · 9d480e3 · 9d480e3
1 parent 2d9877d
commit 9d480e3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/meson.build b/meson.build
@@ -58,8 +58,9 @@ gitver = configuration_data()
 gitver.set_quoted('GITVERSION', git_version.stdout().strip())
 gitversion_h = configure_file(output: 'gitversion.h', configuration: gitver)
 
-# Macros can be written to config.h (see below) using conf.set()
+# Macros will be written to config.h later when configure_file() runs
 conf = configuration_data()
+conf.set('MESON_BUILD', 1)
 
 subdir('source')
 

diff --git a/source/glest_game/facilities/game_util.cpp b/source/glest_game/facilities/game_util.cpp
@@ -9,7 +9,11 @@
 //	License, or (at your option) any later version
 // ==============================================================
 
+// This condition can be removed after the cmake build is deprecated
+#ifdef MESON_BUILD
 #include "gitversion.h"
+#endif
+
 #include "game_util.h"
 
 #include "util.h"