diff --git a/src/musredit_qt5/musrStep/CMakeLists.txt b/src/musredit_qt5/musrStep/CMakeLists.txt index 802e98d5..7932d139 100644 --- a/src/musredit_qt5/musrStep/CMakeLists.txt +++ b/src/musredit_qt5/musrStep/CMakeLists.txt @@ -21,10 +21,19 @@ set(CMAKE_AUTOUIC OFF) # add qt/rcc qt5_add_resources(musrStep_rcc musrStep.qrc) -add_executable(musrStep - ${musrStep_src} - ${musrStep_rcc} -) +set(macosx_icon icons/musrStep.icns) +if (APPLE) + add_executable(musrStep MACOSX_BUNDLE + ${musrStep_src} + ${musrStep_rcc} + ${macosx_icon} + ) +else (APPLE) + add_executable(musrStep + ${musrStep_src} + ${musrStep_rcc} + ) +endif (APPLE) target_include_directories(musrStep BEFORE PRIVATE @@ -38,10 +47,26 @@ target_include_directories(musrStep target_link_libraries(musrStep ${qt_libs}) #--- installation info -------------------------------------------------------- -install( - TARGETS - musrStep - RUNTIME DESTINATION - bin -) +if (APPLE) + set_target_properties(musrStep PROPERTIES + MACOSX_BUNDLE TRUE + MACOSX_BUNDLE_BUNDLE_NAME "musrStep" + MACOSX_BUNDLE_INFO_STRING "musrfit: musrStep allows to reset/set the initial step size of a msr-files." + MACOSX_BUNDLE_ICON_FILE "musrStep.icns" + MACOSX_BUNDLE_LONG_VERSION_STRING "${PROJECT_VERSION}" + MACOSX_BUNDLE_GUI_IDENTIFIER "ch.psi.lmu.musrStep" + MACOSX_BUNDLE_COPYRIGHT "Andreas Suter" + RESOURCE ${macosx_icon} + ) +endif (APPLE) + +if (APPLE) + install( TARGETS musrStep + BUNDLE DESTINATION /Applications + ) +else (APPLE) + install( TARGETS musrStep + RUNTIME DESTINATION bin + ) +endif (APPLE) diff --git a/src/musredit_qt5/musrWiz/CMakeLists.txt b/src/musredit_qt5/musrWiz/CMakeLists.txt index bc2db3f8..116d95a7 100644 --- a/src/musredit_qt5/musrWiz/CMakeLists.txt +++ b/src/musredit_qt5/musrWiz/CMakeLists.txt @@ -25,10 +25,19 @@ set(CMAKE_AUTOUIC OFF) # add qt/rcc qt5_add_resources(musrWiz_rcc musrWiz.qrc) -add_executable(musrWiz - ${musrWiz_src} - ${musrWiz_rcc} -) +set(macosx_icon icons/musrWiz.icns) +if (APPLE) + add_executable(musrWiz MACOSX_BUNDLE + ${musrWiz_src} + ${musrWiz_rcc} + ${macosx_icon} + ) +else (APPLE) + add_executable(musrWiz + ${musrWiz_src} + ${musrWiz_rcc} + ) +endif (APPLE) target_include_directories(musrWiz BEFORE PRIVATE @@ -42,10 +51,25 @@ target_include_directories(musrWiz target_link_libraries(musrWiz ${qt_libs}) #--- installation info -------------------------------------------------------- -install( - TARGETS - musrWiz - RUNTIME DESTINATION - bin -) +if (APPLE) + set_target_properties(musrWiz PROPERTIES + MACOSX_BUNDLE TRUE + MACOSX_BUNDLE_BUNDLE_NAME "musrWiz" + MACOSX_BUNDLE_INFO_STRING "musrfit: musrWiz allows to create input msr-files if no templates are available." + MACOSX_BUNDLE_ICON_FILE "musrWiz.icns" + MACOSX_BUNDLE_LONG_VERSION_STRING "${PROJECT_VERSION}" + MACOSX_BUNDLE_GUI_IDENTIFIER "ch.psi.lmu.musrWiz" + MACOSX_BUNDLE_COPYRIGHT "Andreas Suter" + RESOURCE ${macosx_icon} + ) +endif (APPLE) +if (APPLE) + install( TARGETS musrWiz + BUNDLE DESTINATION /Applications + ) +else (APPLE) + install( TARGETS musrWiz + RUNTIME DESTINATION bin + ) +endif (APPLE) diff --git a/src/musredit_qt5/musredit/CMakeLists.txt b/src/musredit_qt5/musredit/CMakeLists.txt index ee47c199..d77727be 100644 --- a/src/musredit_qt5/musredit/CMakeLists.txt +++ b/src/musredit_qt5/musredit/CMakeLists.txt @@ -119,10 +119,10 @@ if (APPLE) set_target_properties(musredit PROPERTIES MACOSX_BUNDLE TRUE MACOSX_BUNDLE_BUNDLE_NAME "musredit" - MACOSX_BUNDLE_INFO_STRING "musredit simplifies the handling of the msr-files for uSR fitting." + MACOSX_BUNDLE_INFO_STRING "musrfit: musredit simplifies the handling of the msr-files for uSR fitting." MACOSX_BUNDLE_ICON_FILE "musredit.icns" MACOSX_BUNDLE_LONG_VERSION_STRING "${PROJECT_VERSION}" - MACOSX_FRAMEWORK_IDENTIFIER ch.psi.musredit + MACOSX_BUNDLE_GUI_IDENTIFIER "ch.psi.lmu.musredit" MACOSX_BUNDLE_COPYRIGHT "Andreas Suter" RESOURCE ${macosx_icon} )