From b1d714c3ff33cba5f5f4aa976653e23dff48c536 Mon Sep 17 00:00:00 2001 From: Massimo Callegari Date: Sat, 4 May 2024 12:45:45 +0200 Subject: [PATCH] macos: fix launcher cmake build --- launcher/CMakeLists.txt | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/launcher/CMakeLists.txt b/launcher/CMakeLists.txt index 8a84ad7127..2c42d80c52 100644 --- a/launcher/CMakeLists.txt +++ b/launcher/CMakeLists.txt @@ -19,7 +19,7 @@ else() qt5_add_translation(QM_FILES ${TS_FILES}) endif() -add_executable(${module_name} WIN32 MACOSX_BUNDLE +add_executable(${module_name} MACOSX_BUNDLE launcher.cpp launcher.h main.cpp ${QM_FILES} @@ -36,7 +36,6 @@ target_link_libraries(${module_name} PRIVATE Qt${QT_MAJOR_VERSION}::Widgets ) - # Resources: set_source_files_properties("../resources/icons/png/qlcplus-fixtureeditor.png" PROPERTIES QT_RESOURCE_ALIAS "qlcplus-fixtureeditor.png" @@ -49,12 +48,20 @@ set(launcher_resource_files "../resources/icons/png/qlcplus.png" ) -qt_add_resources(${module_name} "launcher" +if(QT_VERSION_MAJOR GREATER 5) + qt_add_resources(${module_name} "launcher" PREFIX "/" + BASE + "." FILES ${launcher_resource_files} ) +else() + qt5_add_resources($launcher.qrc) + target_sources(${module_name} PRIVATE + ${launcher_resource_files}) +endif() install(TARGETS ${module_name} DESTINATION ${INSTALLROOT}/${BINDIR}