Merge pull request #955 from stephengtuggy/fix/macOS-installer-0.9.x-…

…part-2 2x CMakeLists.txt: More fixes for macOS installer package
vegastrike · Jan 2, 2025 · 6b1424a · 6b1424a
2 parents d10b37f + 89f2c6b
commit 6b1424a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
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-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}")
+    INSTALL(TARGETS vegastrike-engine COMPONENT vegastrike_engine BUNDLE DESTINATION "${CMAKE_OSX_APPLICATIONS_DIR}/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)

diff --git a/engine/setup/CMakeLists.txt b/engine/setup/CMakeLists.txt
@@ -93,7 +93,7 @@ ELSEIF (CMAKE_SYSTEM_NAME STREQUAL Darwin)
 	)
 	TARGET_LINK_LIBRARIES(vegasettings ${GTK_LIBS})
 
-	INSTALL(TARGETS vegasettings COMPONENT vegasettings BUNDLE DESTINATION "${CMAKE_OSX_APPLICATIONS_DIR}/VegaStrike-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}")
+	INSTALL(TARGETS vegasettings COMPONENT vegasettings BUNDLE DESTINATION "${CMAKE_OSX_APPLICATIONS_DIR}/VegaStrike")
 ELSE ()
 	MESSAGE ("SKIPPING vegasettings - not supported on this platform at this time")
 ENDIF ()