Enable macOS install & packaging

Requires a few hacks regarding the installer, to prevent the "Install Rosetta" dialog from being shown and also make the package non-relocatable, which wreaks havoc when installing on development machines,like  overwriting the bundle in the build dir.

Author: kblaschke

CMakeLists.txt

@@ -15,6 +15,9 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
 
 option(ENABLE_FLAT_PACKAGE "Creates a \"flat\" install layout with the executable, configuration file(s) and preset/texture dirs directly in the install prefix." OFF)
 option(ENABLE_INSTALL_BDEPS "Installs all shared libraries projectMSDL requires to run. On some platforms, CMake 3.31 or higher is required for this to work!" OFF)
+
+set(PROJECTMSDL_PROPERTIES_FILENAME "projectMSDL.properties")
+
 if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND NOT ENABLE_FLAT_PACKAGE)
     include(GNUInstallDirs)
 
@@ -24,7 +27,6 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND NOT ENABLE_FLAT_PACKAGE)
     set(PROJECTMSDL_PRESETS_DIR "${PROJECTMSDL_DATA_DIR}/presets" CACHE STRING "Directory to install optional preset files, relative to the install prefix.")
     set(PROJECTMSDL_TEXTURES_DIR "${PROJECTMSDL_DATA_DIR}/textures" CACHE STRING "Directory to install optional texture files, relative to the install prefix.")
 
-
     # Additional options for desktop integration
     option(ENABLE_DESKTOP_ICON "Install a .desktop file and icons" ON)
     set(PROJECTMSDL_DESKTOP_DIR "${CMAKE_INSTALL_DATAROOTDIR}/applications" CACHE STRING "Directory to install the .desktop file in, relative to the install prefix.")
@@ -47,7 +49,11 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND NOT ENABLE_FLAT_PACKAGE)
 
     set(DEFAULT_CONFIG_PATH "\${application.dir}/../Resources" CACHE STRING "Optional path to look for the configuration file in addition to PROJECTMSDL_BIN_DIR.")
     set(DEFAULT_PRESETS_PATH "\${application.dir}/../Resources/Presets" CACHE STRING "Default presets path in the configuration file.")
-    set(DEFAULT_TEXTURES_PATH "\${application.dir}/../Resources/Presets" CACHE STRING "Default textures path in the configuration file.")
+    set(DEFAULT_TEXTURES_PATH "\${application.dir}/../Resources/Textures" CACHE STRING "Default textures path in the configuration file.")
+
+    set(PROJECTMSDL_PROPERTIES_FILENAME "projectM.properties")
+
+    set(CMAKE_INSTALL_RPATH "@loader_path/../PlugIns")
 else()
     set(DEFAULT_PACKAGING_CONFIG "packaging-windows.cmake")
 
@@ -61,6 +67,7 @@ else()
     set(DEFAULT_CONFIG_PATH "" CACHE STRING "Optional path to look for the configuration file in addition to PROJECTMSDL_BIN_DIR.")
     set(DEFAULT_PRESETS_PATH "\${application.dir}/presets" CACHE STRING "Default presets path in the configuration file.")
     set(DEFAULT_TEXTURES_PATH "\${application.dir}/textures" CACHE STRING "Default textures path in the configuration file.")
+
 endif()
 
 if(CMAKE_SYSTEM_NAME STREQUAL "Linux")

cmake/CPack.distribution.dist.in

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<installer-gui-script minSpecVersion="1.0">
+    <title>@CPACK_PACKAGE_NAME@</title>
+    <welcome file="@CPACK_RESOURCE_FILE_WELCOME_NOPATH@"/>
+    <readme file="@CPACK_RESOURCE_FILE_README_NOPATH@"/>
+    <license file="@CPACK_RESOURCE_FILE_LICENSE_NOPATH@"/>
+    <options allow-external-scripts="no" customize="allow" rootVolumeOnly="false" hostArchitectures="@CPACK_OSX_ARCHITECTURES@"></options>
+    <domains enable_anywhere="true" enable_currentUserHome="false" enable_localSystem="true"/>
+    @CPACK_PACKAGEMAKER_CHOICES@
+</installer-gui-script>

install.cmake

@@ -7,11 +7,13 @@ install(TARGETS projectMSDL
 
 install(FILES ${PROJECTM_CONFIGURATION_FILE}
         DESTINATION ${PROJECTMSDL_DATA_DIR}
+        RENAME ${PROJECTMSDL_PROPERTIES_FILENAME}
         COMPONENT projectMSDL
         )
 
 if(ENABLE_INSTALL_BDEPS)
     install(RUNTIME_DEPENDENCY_SET projectMSDLDepends
+            COMPONENT projectMSDL
 
             # Important: Due to CMake bug #24606 this needs to stay at the top of the argument list!
             # Exclude OS libraries on Linux/macOS
@@ -20,6 +22,7 @@ if(ENABLE_INSTALL_BDEPS)
             "^/usr/lib(32|64)?/+"
             "^/Library/+"
 
+            LIBRARY DESTINATION ${PROJECTMSDL_LIB_DIR}
             RUNTIME DESTINATION ${PROJECTMSDL_LIB_DIR}
             FRAMEWORK DESTINATION ${PROJECTMSDL_DATA_DIR}
             )

packaging-macos.cmake

@@ -12,14 +12,11 @@ set(CPACK_STRIP_FILES TRUE)
 ### Productbuild configuration
 set(CPACK_PKGBUILD_IDENTITY_NAME "${CODESIGN_IDENTITY_INSTALLER}")
 set(CPACK_PRODUCTBUILD_IDENTITY_NAME "${CODESIGN_IDENTITY_INSTALLER}")
+set(CPACK_PRODUCTBUILD_IDENTIFIER "org.projectm-visualizer.projectmsdl")
 
-set(CPACK_PRODUCTBUILD_DOMAINS TRUE)
-set(CPACK_PRODUCTBUILD_DOMAINS_ANYWHERE TRUE)
-set(CPACK_PRODUCTBUILD_DOMAINS_USER TRUE)
-set(CPACK_PRODUCTBUILD_DOMAINS_ROOT TRUE)
-
-set(CPACK_PACKAGE_INSTALL_DIRECTORY /)
-set(CPACK_PACKAGING_INSTALL_PREFIX /)
+string(REPLACE ";" "," INSTALL_ARCHITECTURES "${CMAKE_OSX_ARCHITECTURES}")
+file(WRITE "${CMAKE_BINARY_DIR}/CPackAdditionalConfig.cmake" "set(CPACK_OSX_ARCHITECTURES \"${INSTALL_ARCHITECTURES}\")")
+set(CPACK_PROJECT_CONFIG_FILE "${CMAKE_BINARY_DIR}/CPackAdditionalConfig.cmake")
 
 # Installer texts
 set(CPACK_RESOURCE_FILE_WELCOME "${CMAKE_SOURCE_DIR}/src/resources/macos-welcome.txt")
@@ -31,3 +28,7 @@ set(CPACK_GENERATOR productbuild)
 set(CPACK_SOURCE_GENERATOR TGZ)
 
 include(CPack)
+
+cpack_add_component(projectMSDL
+        PLIST "${CMAKE_SOURCE_DIR}/src/resources/projectMSDL-component.plist"
+)

src/ProjectMSDLApplication.cpp

@@ -72,6 +72,7 @@ void ProjectMSDLApplication::initialize(Poco::Util::Application& self)
             {
                 Poco::Path configFilePath(configPath);
                 configFilePath.makeDirectory().setFileName(configFileName);
+                poco_information_f1(logger(), "Trying to load configuration from %s.", configFilePath.toString());
                 if (Poco::File(configFilePath).exists())
                 {
                     loadConfiguration(configFilePath.toString(), PRIO_DEFAULT);

src/resources/projectMSDL-component.plist

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<array>
+    <dict>
+        <key>BundleHasStrictIdentifier</key>
+        <true/>
+        <key>BundleIsRelocatable</key>
+        <false/>
+        <key>BundleIsVersionChecked</key>
+        <true/>
+        <key>BundleOverwriteAction</key>
+        <string>upgrade</string>
+        <key>RootRelativeBundlePath</key>
+        <string>Applications/projectM.app</string>
+    </dict>
+</array>
+</plist>

src/resources/projectMSDL.properties.in

@@ -25,8 +25,8 @@ window.fullscreen.width = 0
 window.fullscreen.height = 0
 
 # Window size if not in fullscreen
-window.width = 1024
-window.height = 768
+window.width = 1920
+window.height = 1080
 
 # Override system default window position
 window.overridePosition = false