From 01ce90e97e4dc04d8c31de6536c7e3b0ad221630 Mon Sep 17 00:00:00 2001
From: Andreas Suter <andreas.suter@psi.ch>
Date: Tue, 16 Feb 2021 20:46:52 +0100
Subject: [PATCH] better version for icons under macosx.

---
 src/musredit_qt5/musredit/CMakeLists.txt | 18 ++++++++----------
 src/musredit_qt6/musredit/CMakeLists.txt | 17 +++++++----------
 2 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/src/musredit_qt5/musredit/CMakeLists.txt b/src/musredit_qt5/musredit/CMakeLists.txt
index 4022f2ec..a3d4d920 100644
--- a/src/musredit_qt5/musredit/CMakeLists.txt
+++ b/src/musredit_qt5/musredit/CMakeLists.txt
@@ -88,12 +88,14 @@ set_property(SOURCE ui_PMsr2DataDialog.h PROPERTY SKIP_AUTOMOC ON)
 set_property(SOURCE ui_PChangeDefaultPathsDialog.h PROPERTY SKIP_AUTOMOC ON)
 set_property(SOURCE qrc_musredit.cpp PROPERTY SKIP_AUTOMOC ON)
 
-if (${CMAKE_HOST_SYSTEM_VERSION} GREATER_EQUAL "20.3.0")
-  set(macosx_icon icons/musredit-bigsur.icns)
-else()	
-  set(macosx_icon icons/musredit.icns)
-endif()
 if (APPLE)
+  if (${CMAKE_HOST_SYSTEM_VERSION} GREATER_EQUAL "20.3.0")
+    set(macosx_icon_name musredit-bigsur.icns)
+  else()	
+    set(macosx_icon_name musredit.icns)
+  endif()
+  set(macosx_icon "icons/${macosx_icon_name}")
+message(STATUS "macosx_icon: ${macosx_icon}")
   add_executable(musredit MACOSX_BUNDLE
     ${musredit_src}
     ${out_ui}
@@ -148,11 +150,7 @@ if (APPLE)
     MACOSX_BUNDLE TRUE
     MACOSX_BUNDLE_BUNDLE_NAME "musredit"
     MACOSX_BUNDLE_INFO_STRING "musrfit: musredit simplifies the handling of the msr-files for uSR fitting."
-    if (${CMAKE_HOST_SYSTEM_VERSION} GREATER_EQUAL "20.3.0")
-      MACOSX_BUNDLE_ICON_FILE "musredit-bigsur.icns"
-    else()
-      MACOSX_BUNDLE_ICON_FILE "musredit.icns"
-    endif()  
+    MACOSX_BUNDLE_ICON_FILE "${macosx_icon_name}"
     MACOSX_BUNDLE_LONG_VERSION_STRING "${PROJECT_VERSION}"
     MACOSX_BUNDLE_GUI_IDENTIFIER "ch.psi.lmu.musredit"
     MACOSX_BUNDLE_COPYRIGHT "Andreas Suter"
diff --git a/src/musredit_qt6/musredit/CMakeLists.txt b/src/musredit_qt6/musredit/CMakeLists.txt
index 0daacab5..eae972a7 100644
--- a/src/musredit_qt6/musredit/CMakeLists.txt
+++ b/src/musredit_qt6/musredit/CMakeLists.txt
@@ -84,12 +84,13 @@ set_property(SOURCE ui_PMsr2DataDialog.h PROPERTY SKIP_AUTOMOC ON)
 set_property(SOURCE ui_PChangeDefaultPathsDialog.h PROPERTY SKIP_AUTOMOC ON)
 set_property(SOURCE qrc_musredit.cpp PROPERTY SKIP_AUTOMOC ON)
 
-if (${CMAKE_HOST_SYSTEM_VERSION} GREATER_EQUAL "20.3.0")
-  set(macosx_icon icons/musredit-bigsur.icns)
-else()
-  set(macosx_icon icons/musredit.icns)
-endif()      	
 if (APPLE)
+  if (${CMAKE_HOST_SYSTEM_VERSION} GREATER_EQUAL "20.3.0")
+    set(macosx_icon_name musredit-bigsur.icns)
+  else()
+    set(macosx_icon_name musredit.icns)
+  endif()
+  set(macosx_icon "icons/${macosx_icon_name}")      	
   add_executable(musredit MACOSX_BUNDLE
     ${musredit_src}
     ${out_ui}
@@ -121,11 +122,7 @@ if (APPLE)
     MACOSX_BUNDLE TRUE
     MACOSX_BUNDLE_BUNDLE_NAME "musredit"
     MACOSX_BUNDLE_INFO_STRING "musrfit: musredit simplifies the handling of the msr-files for uSR fitting."
-    if (${CMAKE_HOST_SYSTEM_VERSION} GREATER_EQUAL "20.3.0")
-      MACOSX_BUNDLE_ICON_FILE "musredit-bigsur.icns"
-    else()
-      MACOSX_BUNDLE_ICON_FILE "musredit.icns"
-    endif()	    
+    MACOSX_BUNDLE_ICON_FILE "${macosx_icon_name}"
     MACOSX_BUNDLE_LONG_VERSION_STRING "${PROJECT_VERSION}"
     MACOSX_BUNDLE_GUI_IDENTIFIER "ch.psi.lmu.musredit"
     MACOSX_BUNDLE_COPYRIGHT "Andreas Suter"