From cfd0bb926234e3ff32acf95ecaacbcc404e31424 Mon Sep 17 00:00:00 2001
From: sithlord48 <sithlord48@gmail.com>
Date: Tue, 3 Dec 2024 22:51:24 -0500
Subject: [PATCH] refactor: clean up mac os deploy files

---
 deploy/CMakeLists.txt                         |  18 +++---------------
 deploy/mac/deploy.cmake                       |  15 +++++++++++++++
 deploy/{ => mac}/dmg-background.tiff          | Bin
 deploy/{ => mac}/dmg-volume.icns              | Bin
 .../{ => mac}/generate_ds_store.applescript   |   0
 5 files changed, 18 insertions(+), 15 deletions(-)
 create mode 100644 deploy/mac/deploy.cmake
 rename deploy/{ => mac}/dmg-background.tiff (100%)
 rename deploy/{ => mac}/dmg-volume.icns (100%)
 rename deploy/{ => mac}/generate_ds_store.applescript (100%)

diff --git a/deploy/CMakeLists.txt b/deploy/CMakeLists.txt
index c5be4cef8..ec8f5bf25 100644
--- a/deploy/CMakeLists.txt
+++ b/deploy/CMakeLists.txt
@@ -77,24 +77,12 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
   else()
     set(OS_STRING "win-${CMAKE_SYSTEM_PROCESSOR}")
   endif()
-elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-  set(OS_STRING "macos-${CMAKE_SYSTEM_PROCESSOR}")
-  set(CMAKE_INSTALL_RPATH "@loader_path/../Libraries;@loader_path/../Frameworks")
-  set(CPACK_PACKAGE_ICON "${PROJECT_SOURCE_DIR}/deploy/dmg-volume.icns")
-  set(CPACK_DMG_BACKGROUND_IMAGE "${PROJECT_SOURCE_DIR}/deploy/dmg-background.tiff")
-  set(CPACK_DMG_DS_STORE_SETUP_SCRIPT "${PROJECT_SOURCE_DIR}/deploy/generate_ds_store.applescript")
-  set(CPACK_DMG_VOLUME_NAME "Deskflow")
-  set(CPACK_DMG_SLA_USE_RESOURCE_FILE_LICENSE ON)
-  set(CPACK_GENERATOR "DragNDrop")
-endif()
-
-if(NOT APPLE)
-  # install linux / unix suport files
+elseif(UNIX AND NOT APPLE)
   include(linux/deploy.cmake)
+elseif(APPLE)
+  include(mac/deploy.cmake)
 endif()
 
-
-
 # Always use "deskflow" for start of name
 set(CPACK_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${PACKAGE_VERSION_LABEL}-${OS_STRING}")
 message(STATUS "Package Basename: ${CPACK_PACKAGE_FILE_NAME}")
diff --git a/deploy/mac/deploy.cmake b/deploy/mac/deploy.cmake
new file mode 100644
index 000000000..f69133d97
--- /dev/null
+++ b/deploy/mac/deploy.cmake
@@ -0,0 +1,15 @@
+# SPDX-FileCopyrightText: 2024 Chris Rizzitello <sithlord48@gmail.com>
+# SPDX-License-Identifier: MIT
+
+# HACK This is set when the files is included so its the real path
+# calling CMAKE_CURRENT_LIST_DIR after include would return the wrong scope var
+set(MY_DIR ${CMAKE_CURRENT_LIST_DIR})
+
+set(OS_STRING "macos-${CMAKE_SYSTEM_PROCESSOR}")
+set(CMAKE_INSTALL_RPATH "@loader_path/../Libraries;@loader_path/../Frameworks")
+set(CPACK_PACKAGE_ICON "${MY_DIR}/dmg-volume.icns")
+set(CPACK_DMG_BACKGROUND_IMAGE "${MY_DIR}/dmg-background.tiff")
+set(CPACK_DMG_DS_STORE_SETUP_SCRIPT "${MY_DIR}/generate_ds_store.applescript")
+set(CPACK_DMG_VOLUME_NAME "Deskflow")
+set(CPACK_DMG_SLA_USE_RESOURCE_FILE_LICENSE ON)
+set(CPACK_GENERATOR "DragNDrop")
diff --git a/deploy/dmg-background.tiff b/deploy/mac/dmg-background.tiff
similarity index 100%
rename from deploy/dmg-background.tiff
rename to deploy/mac/dmg-background.tiff
diff --git a/deploy/dmg-volume.icns b/deploy/mac/dmg-volume.icns
similarity index 100%
rename from deploy/dmg-volume.icns
rename to deploy/mac/dmg-volume.icns
diff --git a/deploy/generate_ds_store.applescript b/deploy/mac/generate_ds_store.applescript
similarity index 100%
rename from deploy/generate_ds_store.applescript
rename to deploy/mac/generate_ds_store.applescript