cmaked

thorstink · Oct 6, 2024 · 894c3d3 · 894c3d3
1 parent 3c969ff
commit 894c3d3
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/.github/workflows/config.yml b/.github/workflows/config.yml
@@ -15,7 +15,6 @@ jobs:
         cd build
         bash -c 'cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_EXAMPLES=ON ..'
         make
-        bash ../.github/workflows/macos/create_app_bundle.sh
     - name: Upload macos
       uses: actions/upload-artifact@v4
       with:

diff --git a/.github/workflows/macos/create_app_bundle.sh b/.github/workflows/macos/create_app_bundle.sh
@@ -8,5 +8,4 @@ mkdir -p Farbart.app/Contents Farbart.app/Contents/MacOS Farbart.app/Contents/Re
 cp icons/icon.icns Farbart.app/Contents/Resources/farbart.icns
 cp ../.github/workflows/macos/Info.plist Farbart.app/Contents/Info.plist
 cp symmetri/gui/Farbart Farbart.app/Contents/MacOS/Farbart
-xattr -cr Farbart.app
 tar -czf Farbart.tar.gz Farbart.app
diff --git a/symmetri/gui/CMakeLists.txt b/symmetri/gui/CMakeLists.txt
@@ -71,5 +71,12 @@ endif()
 add_executable(Farbart ${ALL_SOURCES})
 target_link_libraries(Farbart static_symmetri ${EXTRA_LIBS})
 
-add_executable(generate_icon generate_icon.cpp  ../submodules/tinyxml2/tinyxml2.cpp
+if (APPLE)
+    add_executable(generate_icon generate_icon.cpp  ../submodules/tinyxml2/tinyxml2.cpp)
+    add_dependencies(generate_icon Farbart)
+    add_custom_command(TARGET generate_icon POST_BUILD
+    COMMAND bash -c "bash ../.github/workflows/macos/create_app_bundle.sh"
+    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/build
+    COMMENT "Creating MacOS app-bundle"
 )
+endif()