update the way we pass definitions to cmake

cdce8p · Jan 17, 2023 · 77b3ec5 · 77b3ec5
1 parent 182f685
commit 77b3ec5
Show file tree

Hide file tree

Showing 10 changed files with 9 additions and 19 deletions.
diff --git a/launcher/CMakeLists.txt b/launcher/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required (VERSION 3.17.0)
 set (CMAKE_SYSTEM_VERSION 6.1 CACHE TYPE INTERNAL FORCE)
 project (launcher C)
-add_definitions(-DGUI -DWIN32_LEAN_AND_MEAN)
-add_executable(launcher ../../launcher.c)
+add_definitions(-DGUI=${GUI} -DWIN32_LEAN_AND_MEAN)
+add_executable(launcher ../launcher.c)
diff --git a/setuptools/cli-32.exe b/setuptools/cli-32.exe
diff --git a/setuptools/cli-64.exe b/setuptools/cli-64.exe
diff --git a/setuptools/cli-arm64.exe b/setuptools/cli-arm64.exe
diff --git a/setuptools/cli.exe b/setuptools/cli.exe
diff --git a/setuptools/gui-32.exe b/setuptools/gui-32.exe
diff --git a/setuptools/gui-64.exe b/setuptools/gui-64.exe
diff --git a/setuptools/gui-arm64.exe b/setuptools/gui-arm64.exe
diff --git a/setuptools/gui.exe b/setuptools/gui.exe
diff --git a/tools/build_launchers.py b/tools/build_launchers.py
@@ -23,7 +23,7 @@
 GUI = {"cli": 0, "gui": 1}
 BUILD_PLATFORMS = ["Win32", "x64", "arm64"]
 REPO_ROOT = Path(__file__).parent.parent.resolve()
-LAUNCHER_PROJECT_ROOT = REPO_ROOT / "launcher"
+LAUNCHER_CMAKE_PROJECT = REPO_ROOT / "launcher"
 MSBUILD_OUT_DIR = REPO_ROOT / "setuptools"
 """
 Might be modified to visual studio that currently installed on the machine.
@@ -54,9 +54,9 @@ def get_executable_name(name, platform: str):
     return f"{name}-{platform}"
 
 
-def generate_cmake_project(cmake, build_arena, cmake_project_path, platform):
+def generate_cmake_project(cmake, build_arena, cmake_project_path, platform, is_gui):
     subprocess.check_call(f'{cmake} -G "{VISUAL_STUDIO_VERSION}" -A "{platform}"'
-                          f' {cmake_project_path}', cwd=build_arena, shell=True)
+                          f' {cmake_project_path} -DGUI={is_gui}', cwd=build_arena, shell=True)
 
 
 def build_cmake_project_with_msbuild(msbuild, build_arena, msbuild_parameters):
@@ -96,7 +96,7 @@ def get_msbuild():
             '-products * -requires Microsoft.Component.'
             'MSBuild -find MSBuild\\**\\Bin\\MSBuild.exe',
             shell=True, encoding="utf-8").strip()
-        if msbuild_path is "":
+        if msbuild_path == "":
             raise
     except Exception:
         raise Exception("Ensure that Visual Studio is installed correctly")
@@ -107,28 +107,18 @@ def main():
     msbuild = f'"{get_msbuild()}"'
 
     build_arena = REPO_ROOT / "build-arena"
-    launcher_project_in_arena = build_arena / "launcher"
     for platform in BUILD_PLATFORMS:
         for target in BUILD_TARGETS:
             print(f"Building {target} for {platform}")
             if build_arena.exists():
                 shutil.rmtree(build_arena)
             build_arena.mkdir()
 
-            # Since MSBuild does not allow to pass compile definitions we modify them
-            # per target in CMakeLists.txt
-            shutil.copytree(REPO_ROOT / LAUNCHER_PROJECT_ROOT,
-                            launcher_project_in_arena)
-            cmake_lists = launcher_project_in_arena / "CMakeLists.txt"
-            modified_definition = cmake_lists.read_text(encoding="utf-8") \
-                .replace("GUI",
-                         f"GUI={GUI[target]}")
-            cmake_lists.write_text(modified_definition)
-
             generate_cmake_project(cmake,
                                    build_arena,
-                                   (build_arena / "launcher").resolve(),
-                                   platform)
+                                   LAUNCHER_CMAKE_PROJECT,
+                                   platform,
+                                   GUI[target])
 
             build_params = f"/t:build " \
                            f"/property:Configuration=Release " \