[education/rkward/kf5] rkward: Attempt to fix Mac build

Thomas Friedrichsmeier null at kde.org
Wed Apr 10 16:12:08 BST 2024


Git commit 5f5a6dd6084ebe85be4bfcd0aa2e58f1c274c0fa by Thomas Friedrichsmeier.
Committed on 04/04/2024 at 21:37.
Pushed by tfry into branch 'kf5'.

Attempt to fix Mac build

M  +1    -3    rkward/CMakeLists.txt

https://invent.kde.org/education/rkward/-/commit/5f5a6dd6084ebe85be4bfcd0aa2e58f1c274c0fa

diff --git a/rkward/CMakeLists.txt b/rkward/CMakeLists.txt
index 3a7ba3a6e..5743ff734 100644
--- a/rkward/CMakeLists.txt
+++ b/rkward/CMakeLists.txt
@@ -103,7 +103,6 @@ ENDIF(SYMLINKS_FAILED)
 
 
 IF(APPLE)
-    INSTALL(TARGETS rkward DESTINATION ${BUNDLE_INSTALL_DIR})
     if(APPLE_STANDALONE_BUNDLE)
 #         INSTALL(FILES ${CMAKE_SOURCE_DIR}/rkward/icons/app-icon/rkward.icns DESTINATION ${BUNDLE_INSTALL_DIR}/${CPACK_BUNDLE_NAME}.app/Contents/Resources)
 #         INSTALL(FILES ${RKWARD_INFOPLIST_FILE} DESTINATION ${BUNDLE_INSTALL_DIR}/${CPACK_BUNDLE_NAME}.app/Contents)
@@ -121,9 +120,8 @@ IF(APPLE)
     set_target_properties(rkward PROPERTIES MACOSX_BUNDLE_SHORT_VERSION_STRING "${RKVERSION_NUMBER}")
     set_target_properties(rkward PROPERTIES MACOSX_BUNDLE_BUNDLE_VERSION "${RKVERSION_NUMBER}")
     set_target_properties(rkward PROPERTIES MACOSX_BUNDLE_COPYRIGHT "RKWard Team")
-ELSE()
-    INSTALL(TARGETS rkward ${KF6_INSTALL_TARGETS_DEFAULT_ARGS})
 ENDIF()
+INSTALL(TARGETS rkward ${KF6_INSTALL_TARGETS_DEFAULT_ARGS})
 
 INSTALL(FILES org.kde.rkward.desktop DESTINATION ${KDE_INSTALL_APPDIR})
 INSTALL(FILES org.kde.rkward.metainfo.xml DESTINATION ${KDE_INSTALL_METAINFODIR})



More information about the rkward-tracker mailing list