Merge pull request vegastrike#957 from stephengtuggy/yet_more_macOS_i…

…nstaller_0.9.x Yet more on macOS installer - 0.9.x
stephengtuggy · Jan 4, 2025 · 4648beb · 4648beb
2 parents 6b1424a + 3966bb5
commit 4648beb
Show file tree

Hide file tree

Showing 7 changed files with 684 additions and 11 deletions.
diff --git a/.github/workflows/Windows-Release.yml b/.github/workflows/Windows-Release.yml
@@ -24,12 +24,12 @@ jobs:
           - os:              windows-2019
             cmake-generator: VS2019Win64
             enable-pie:      1
-            build-type:      Release
+            build-type:      RelWithDebInfo
             is-release:      1
           - os:              windows-2022
             cmake-generator: VS2022Win64
             enable-pie:      1
-            build-type:      Debug
+            build-type:      RelWithDebInfo
             is-release:      1
 
     env:

diff --git a/engine/CMakeLists.txt b/engine/CMakeLists.txt
@@ -1298,7 +1298,7 @@ IF (CMAKE_SYSTEM_NAME STREQUAL Windows)
     INSTALL(TARGETS vegastrike-engine COMPONENT vegastrike_engine RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
     INSTALL(PROGRAMS "${CMAKE_CURRENT_BINARY_DIR}/${CPACK_BUILD_CONFIG}/vegastrike-engine.exe" RENAME vegastrike.exe DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT vegastrike_alias)
 ELSEIF (CMAKE_SYSTEM_NAME STREQUAL Darwin)
-    INSTALL(TARGETS vegastrike-engine COMPONENT vegastrike_engine BUNDLE DESTINATION "${CMAKE_OSX_APPLICATIONS_DIR}/VegaStrike")
+    INSTALL(TARGETS vegastrike-engine DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT vegastrike_engine BUNDLE DESTINATION "/Applications/VegaStrike")
 ELSEIF (CMAKE_SYSTEM_NAME STREQUAL Linux)
     INSTALL(TARGETS vegastrike-engine COMPONENT vegastrike_engine RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
     INSTALL(PROGRAMS "${CMAKE_CURRENT_BINARY_DIR}/vegastrike-engine" RENAME vegastrike DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT vegastrike_alias)