Making mac bundle identifier configurable at build time

gershnik · May 23, 2023 · 3825f51 · 3825f51
1 parent d898eab
commit 3825f51
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -29,9 +29,11 @@ endif()
 option(WSDDN_PREFER_SYSTEM "whether to prefer system versions of dependencies (such as libxm2)" ${WSDDN_PREFER_SYSTEM_DEFAULT})
 
 if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
-
     set(WSDDN_WITH_SYSTEMD "auto" CACHE STRING "enable systemd scripts and notification support")
+endif()
 
+if (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
+    set(WSDDN_BUNDLE_IDENTIFIER "io.github.gershnik.wsddn" CACHE STRING "macOS bundle identifier")
 endif()
 
 

diff --git a/src/Info.template.plist b/src/Info.template.plist
@@ -7,7 +7,7 @@
 <plist version="1.0">
 <dict>
 	<key>CFBundleIdentifier</key>
-	<string>io.github.gershnik.wsdd-native</string>
+	<string>@WSDDN_BUNDLE_IDENTIFIER@</string>
 	<key>CFBundleName</key>
 	<string>wsddn</string>
 	<key>CFBundleDisplayName</key>

diff --git a/src/sys_config.h.in b/src/sys_config.h.in
@@ -21,6 +21,7 @@
     #define ADMIN_GROUP_NAME "admin"
     #define WSDDN_DEFAULT_USER_NAME "_wsddn"
     #define WSDDN_DEFAULT_CHROOT_DIR "/var/empty"
+    #define WSDDN_BUNDLE_IDENTIFIER "@WSDDN_BUNDLE_IDENTIFIER@"
 #else
     #define WSDDN_PLATFORM_APPLE 0
     #define WSDDN_DEFAULT_USER_NAME "wsddn"

diff --git a/src/sys_util.h b/src/sys_util.h
@@ -305,7 +305,7 @@ class SystemdLevelFormatter : public spdlog::custom_flag_formatter
     {
         using super = spdlog::sinks::base_sink<Mutex>;
     public:
-        OsLogSink() noexcept : m_logger(os_log_create("io.github.gershnik.wsddn", "default")) {
+        OsLogSink() noexcept : m_logger(os_log_create(WSDDN_BUNDLE_IDENTIFIER, "default")) {
         }
         ~OsLogSink() noexcept {
             os_release(m_logger);