From 941f8fcc4e5ab7cebb15caa84f183b6c2a022629 Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Mon, 18 Apr 2022 21:10:14 +0400 Subject: [PATCH] Link Qt 6 resources without hardcoding the build type --- external/qt/qt6/CMakeLists.txt | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/external/qt/qt6/CMakeLists.txt b/external/qt/qt6/CMakeLists.txt index 9189c5c..f5254b0 100644 --- a/external/qt/qt6/CMakeLists.txt +++ b/external/qt/qt6/CMakeLists.txt @@ -124,12 +124,6 @@ else() endif() endif() -if (LINUX) - set(qt_lib_objects objects-RelWithDebInfo) -else() - set(qt_lib_objects objects-$,Debug,RelWithDebInfo>) -endif() - set(common_qt_libs plugins/imageformats/${qt_lib_prefix}qwebp plugins/imageformats/${qt_lib_prefix}qgif @@ -185,7 +179,7 @@ elseif (APPLE) list(APPEND qt_libs_list "${qt_loc}/${lib}${qt_lib_suffix}") endforeach() list(APPEND qt_libs_list - "${qt_loc}/lib/${qt_lib_objects}/QCocoaIntegrationPlugin_resources_1/.rcc/qrc_qcocoaresources.cpp.o" + $ ) else() set(qt_libs_dbus) @@ -235,10 +229,10 @@ else() endif() list(APPEND qt_libs_list - "${qt_loc}/lib/${qt_lib_objects}/Gui_resources_1/.rcc/qrc_qpdf.cpp.o" - "${qt_loc}/lib/${qt_lib_objects}/Widgets_resources_1/.rcc/qrc_qstyle.cpp.o" - "${qt_loc}/lib/${qt_lib_objects}/Widgets_resources_2/.rcc/qrc_qstyle1.cpp.o" - "${qt_loc}/lib/${qt_lib_objects}/Widgets_resources_3/.rcc/qrc_qmessagebox.cpp.o" + $ + $ + $ + $ ) target_link_libraries(external_qt