Build and package in one step

Author: tomas-soltys

.github/workflows/ci.yml

@@ -123,25 +123,25 @@ jobs:
 
       # Build
       - name: Build (Unix)
-        if: matrix.os != 'windows-latest'
-        run: cmake --build build-Release --parallel
-
-      - name: Build (Windows)
-        if: matrix.os == 'windows-latest'
-        run: cmake --build build-Release --parallel
-        shell: pwsh
-
-      # Package
-      - name: CPack (Unix)
         if: matrix.os != 'windows-latest'
         run: cmake --build build-Release --target package --parallel
-        continue-on-error: true
 
-      - name: CPack (Windows)
+      - name: Build (Windows)
         if: matrix.os == 'windows-latest'
         run: cmake --build build-Release --target package --parallel
         shell: pwsh
-        continue-on-error: true
+
+#      # Package
+#      - name: CPack (Unix)
+#        if: matrix.os != 'windows-latest'
+#        run: cmake --build build-Release --target package --parallel
+#        continue-on-error: true
+#
+#      - name: CPack (Windows)
+#        if: matrix.os == 'windows-latest'
+#        run: cmake --build build-Release --target package --parallel
+#        shell: pwsh
+#        continue-on-error: true
 
       # Artifacts
       - name: Upload packages

src/cloud-client/CMakeLists.txt

@@ -72,11 +72,11 @@ elseif (APPLE)
     set_source_files_properties("${APP_ICON}" PROPERTIES MACOSX_PACKAGE_LOCATION "Resources")
     target_sources(cloud-client PRIVATE "${APP_ICON}")
 
-    #add_custom_command(TARGET cloud-client POST_BUILD
-    #    COMMAND /usr/libexec/PlistBuddy -c "Set :CFBundleName string '${PROJECT_SHORT_NAME}'" "$<TARGET_BUNDLE_DIR_NAME:${PROJECT_TARGET_NAME}>/Contents/Info.plist" || /usr/libexec/PlistBuddy -c "Add :CFBundleName string '${PROJECT_SHORT_NAME}'" "$<TARGET_BUNDLE_DIR_NAME:${PROJECT_TARGET_NAME}>/Contents/Info.plist"
-    #    COMMAND /usr/libexec/PlistBuddy -c "Set :CFBundleDisplayName string '${PROJECT_SHORT_NAME}'" "$<TARGET_BUNDLE_DIR_NAME:${PROJECT_TARGET_NAME}>/Contents/Info.plist" || /usr/libexec/PlistBuddy -c "Add :CFBundleDisplayName string '${PROJECT_SHORT_NAME}'" "$<TARGET_BUNDLE_DIR_NAME:${PROJECT_TARGET_NAME}>/Contents/Info.plist"
-    #    COMMENT "Set CFBundleDisplayName"
-    #)
+    add_custom_command(TARGET cloud-client POST_BUILD
+        COMMAND /usr/libexec/PlistBuddy -c "Set :CFBundleName string '${PROJECT_SHORT_NAME}'" "$<TARGET_BUNDLE_DIR_NAME:${PROJECT_TARGET_NAME}>/Contents/Info.plist" || /usr/libexec/PlistBuddy -c "Add :CFBundleName string '${PROJECT_SHORT_NAME}'" "$<TARGET_BUNDLE_DIR_NAME:${PROJECT_TARGET_NAME}>/Contents/Info.plist"
+        COMMAND /usr/libexec/PlistBuddy -c "Set :CFBundleDisplayName string '${PROJECT_SHORT_NAME}'" "$<TARGET_BUNDLE_DIR_NAME:${PROJECT_TARGET_NAME}>/Contents/Info.plist" || /usr/libexec/PlistBuddy -c "Add :CFBundleDisplayName string '${PROJECT_SHORT_NAME}'" "$<TARGET_BUNDLE_DIR_NAME:${PROJECT_TARGET_NAME}>/Contents/Info.plist"
+        COMMENT "Set CFBundleDisplayName"
+    )
 endif()
 
 qt_add_resources(cloud-client icons-application