diff --git a/armoury/CMakeLists.txt b/armoury/CMakeLists.txt index 9269ba5..db968a7 100644 --- a/armoury/CMakeLists.txt +++ b/armoury/CMakeLists.txt @@ -49,10 +49,11 @@ target_link_libraries(novus-armoury Qt6::Concurrent Qt6::Network) -install(FILES zone.xiv.armoury.desktop DESTINATION ${KDE_INSTALL_APPDIR}) -install(FILES zone.xiv.armoury.svg DESTINATION ${KDE_INSTALL_FULL_ICONDIR}/hicolor/scalable/apps) install(TARGETS novus-armoury ${KF${QT_MAJOR_VERSION}_INSTALL_TARGETS_DEFAULT_ARGS}) if (WIN32) install(FILES $ DESTINATION ${CMAKE_INSTALL_BINDIR}) +else() + install(FILES zone.xiv.armoury.desktop DESTINATION ${KDE_INSTALL_APPDIR}) + install(FILES zone.xiv.armoury.svg DESTINATION ${KDE_INSTALL_FULL_ICONDIR}/hicolor/scalable/apps) endif() \ No newline at end of file diff --git a/karuku/CMakeLists.txt b/karuku/CMakeLists.txt index 46886fb..e69bc4a 100644 --- a/karuku/CMakeLists.txt +++ b/karuku/CMakeLists.txt @@ -24,10 +24,11 @@ target_link_libraries(novus-karuku Qt6::Widgets Qt6::Network) -install(FILES zone.xiv.karaku.desktop DESTINATION ${KDE_INSTALL_APPDIR}) -install(FILES zone.xiv.karaku.svg DESTINATION ${KDE_INSTALL_FULL_ICONDIR}/hicolor/scalable/apps) install(TARGETS novus-karuku ${KF${QT_MAJOR_VERSION}_INSTALL_TARGETS_DEFAULT_ARGS}) if (WIN32) install(FILES $ DESTINATION ${CMAKE_INSTALL_BINDIR}) +else() + install(FILES zone.xiv.karaku.desktop DESTINATION ${KDE_INSTALL_APPDIR}) + install(FILES zone.xiv.karaku.svg DESTINATION ${KDE_INSTALL_FULL_ICONDIR}/hicolor/scalable/apps) endif() \ No newline at end of file diff --git a/launcher/CMakeLists.txt b/launcher/CMakeLists.txt index e02a8a6..96d19e4 100644 --- a/launcher/CMakeLists.txt +++ b/launcher/CMakeLists.txt @@ -16,10 +16,19 @@ target_link_libraries(novus-launcher Qt6::Widgets) target_include_directories(novus-launcher PUBLIC include) -install(FILES zone.xiv.novus.desktop DESTINATION ${KDE_INSTALL_APPDIR}) -install(FILES zone.xiv.novus.svg DESTINATION ${KDE_INSTALL_FULL_ICONDIR}/hicolor/scalable/apps) install(TARGETS novus-launcher ${KF${QT_MAJOR_VERSION}_INSTALL_TARGETS_DEFAULT_ARGS}) if (WIN32) install(FILES $ DESTINATION ${CMAKE_INSTALL_BINDIR}) -endif() \ No newline at end of file +else() + install(FILES zone.xiv.novus.desktop DESTINATION ${KDE_INSTALL_APPDIR}) + install(FILES zone.xiv.novus.svg DESTINATION ${KDE_INSTALL_FULL_ICONDIR}/hicolor/scalable/apps) +endif() + +# We only need to call deploy on one executable +qt_generate_deploy_app_script( + TARGET novus-launcher + OUTPUT_SCRIPT deploy_script + NO_UNSUPPORTED_PLATFORM_ERROR +) +install(SCRIPT ${deploy_script}) diff --git a/mapeditor/CMakeLists.txt b/mapeditor/CMakeLists.txt index ced4352..4c3dc50 100644 --- a/mapeditor/CMakeLists.txt +++ b/mapeditor/CMakeLists.txt @@ -24,10 +24,11 @@ target_link_libraries(novus-mapeditor Qt6::Core Qt6::Widgets) -install(FILES zone.xiv.mapeditor.desktop DESTINATION ${KDE_INSTALL_APPDIR}) -install(FILES zone.xiv.mapeditor.svg DESTINATION ${KDE_INSTALL_FULL_ICONDIR}/hicolor/scalable/apps) install(TARGETS novus-mapeditor ${KF${QT_MAJOR_VERSION}_INSTALL_TARGETS_DEFAULT_ARGS}) if (WIN32) install(FILES $ DESTINATION ${CMAKE_INSTALL_BINDIR}) +else() + install(FILES zone.xiv.mapeditor.desktop DESTINATION ${KDE_INSTALL_APPDIR}) + install(FILES zone.xiv.mapeditor.svg DESTINATION ${KDE_INSTALL_FULL_ICONDIR}/hicolor/scalable/apps) endif() \ No newline at end of file diff --git a/mdlviewer/CMakeLists.txt b/mdlviewer/CMakeLists.txt index 3ca0c4a..eb9be21 100644 --- a/mdlviewer/CMakeLists.txt +++ b/mdlviewer/CMakeLists.txt @@ -21,17 +21,11 @@ target_link_libraries(novus-mdlviewer Qt6::Core Qt6::Widgets) -install(FILES zone.xiv.mdlviewer.desktop DESTINATION ${KDE_INSTALL_APPDIR}) -install(FILES zone.xiv.mdlviewer.svg DESTINATION ${KDE_INSTALL_FULL_ICONDIR}/hicolor/scalable/apps) install(TARGETS novus-mdlviewer ${KF${QT_MAJOR_VERSION}_INSTALL_TARGETS_DEFAULT_ARGS}) -qt_generate_deploy_app_script( - TARGET novus-mdlviewer - OUTPUT_SCRIPT deploy_script - NO_UNSUPPORTED_PLATFORM_ERROR -) -install(SCRIPT ${deploy_script}) - if (WIN32) install(FILES $ DESTINATION ${CMAKE_INSTALL_BINDIR}) +else() + install(FILES zone.xiv.mdlviewer.desktop DESTINATION ${KDE_INSTALL_APPDIR}) + install(FILES zone.xiv.mdlviewer.svg DESTINATION ${KDE_INSTALL_FULL_ICONDIR}/hicolor/scalable/apps) endif() \ No newline at end of file diff --git a/sagasu/CMakeLists.txt b/sagasu/CMakeLists.txt index c6f4532..2c56949 100644 --- a/sagasu/CMakeLists.txt +++ b/sagasu/CMakeLists.txt @@ -48,10 +48,11 @@ target_link_libraries(novus-sagasu Qt6::Concurrent Qt6::Network) -install(FILES zone.xiv.sagasu.desktop DESTINATION ${KDE_INSTALL_APPDIR}) -install(FILES zone.xiv.sagasu.svg DESTINATION ${KDE_INSTALL_FULL_ICONDIR}/hicolor/scalable/apps) install(TARGETS novus-sagasu ${KF${QT_MAJOR_VERSION}_INSTALL_TARGETS_DEFAULT_ARGS}) if (WIN32) install(FILES $ DESTINATION ${CMAKE_INSTALL_BINDIR}) +else() + install(FILES zone.xiv.sagasu.desktop DESTINATION ${KDE_INSTALL_APPDIR}) + install(FILES zone.xiv.sagasu.svg DESTINATION ${KDE_INSTALL_FULL_ICONDIR}/hicolor/scalable/apps) endif() \ No newline at end of file