issue openscad#4059: fixed macOS icon and added day to bundle version

gsohler · Oct 11, 2022 · 8d1e0de · 8d1e0de
1 parent e3c82e6
commit 8d1e0de
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -878,16 +878,16 @@ endif()
 
 if (SNAPSHOT)
   target_compile_definitions(OpenSCAD PRIVATE OPENSCAD_SNAPSHOT)
-  set(MACOSX_BUNDLE_ICON_FILE ${RESOURCE_DIR}/icons/icon-nightly.icns)
+  set(MACOSX_BUNDLE_ICON_FILE icon-nightly.icns)
   set(WINDOWS_RESOURCE_PATH ${RESOURCE_DIR}/openscad_win32-nightly.rc)
 else()
-  set(MACOSX_BUNDLE_ICON_FILE ${RESOURCE_DIR}/icons/OpenSCAD.icns)
+  set(MACOSX_BUNDLE_ICON_FILE OpenSCAD.icns)
   set(WINDOWS_RESOURCE_PATH ${RESOURCE_DIR}/openscad_win32.rc)
 endif()
 
 if (APPLE)
   list(APPEND RESOURCE_FILES ${RESOURCE_DIR}/mac.qrc)
-  list(APPEND RESOURCE_FILES ${MACOSX_BUNDLE_ICON_FILE})
+  list(APPEND RESOURCE_FILES ${RESOURCE_DIR}/icons/${MACOSX_BUNDLE_ICON_FILE})
 elseif(WIN32)
   list(APPEND RESOURCE_FILES ${WINDOWS_RESOURCE_PATH})
 endif()
@@ -911,7 +911,7 @@ if(APPLE AND NOT APPLE_UNIX)
     MACOSX_BUNDLE_INFO_PLIST ${CMAKE_SOURCE_DIR}/Info.plist.in
     MACOSX_BUNDLE TRUE
     MACOSX_BUNDLE_ICON_FILE ${MACOSX_BUNDLE_ICON_FILE}
-    MACOSX_BUNDLE_BUNDLE_VERSION ${OPENSCAD_YEAR}.${OPENSCAD_MONTH}
+    MACOSX_BUNDLE_BUNDLE_VERSION ${OPENSCAD_YEAR}.${OPENSCAD_MONTH}.${OPENSCAD_DAY}
     MACOSX_BUNDLE_SHORT_VERSION_STRING ${OPENSCAD_YEAR}.${OPENSCAD_MONTH}
     RESOURCE "${RESOURCE_FILES}"
   )

diff --git a/Info.plist.in b/Info.plist.in
@@ -15,7 +15,7 @@
 	<key>CFBundleIdentifier</key>
 	<string>org.openscad.OpenSCAD</string>
 	<key>CFBundleVersion</key>
-	<string>${MACOSX_BUNDLE_SHORT_VERSION_STRING}</string>
+	<string>${MACOSX_BUNDLE_BUNDLE_VERSION}</string>
 	<key>CFBundleShortVersionString</key>
 	<string>${MACOSX_BUNDLE_SHORT_VERSION_STRING}</string>
 	<key>LSEnvironment</key>