1
0
Fork 0

Link Qt 6 resources without hardcoding the build type

This commit is contained in:
Ilya Fedin 2022-04-18 21:10:14 +04:00 committed by John Preston
parent 8ca7ff8484
commit 941f8fcc4e

View file

@ -124,12 +124,6 @@ else()
endif() endif()
endif() endif()
if (LINUX)
set(qt_lib_objects objects-RelWithDebInfo)
else()
set(qt_lib_objects objects-$<IF:$<CONFIG:Debug>,Debug,RelWithDebInfo>)
endif()
set(common_qt_libs set(common_qt_libs
plugins/imageformats/${qt_lib_prefix}qwebp plugins/imageformats/${qt_lib_prefix}qwebp
plugins/imageformats/${qt_lib_prefix}qgif plugins/imageformats/${qt_lib_prefix}qgif
@ -185,7 +179,7 @@ elseif (APPLE)
list(APPEND qt_libs_list "${qt_loc}/${lib}${qt_lib_suffix}") list(APPEND qt_libs_list "${qt_loc}/${lib}${qt_lib_suffix}")
endforeach() endforeach()
list(APPEND qt_libs_list list(APPEND qt_libs_list
"${qt_loc}/lib/${qt_lib_objects}/QCocoaIntegrationPlugin_resources_1/.rcc/qrc_qcocoaresources.cpp.o" $<TARGET_OBJECTS:Qt6::QCocoaIntegrationPlugin_resources_1>
) )
else() else()
set(qt_libs_dbus) set(qt_libs_dbus)
@ -235,10 +229,10 @@ else()
endif() endif()
list(APPEND qt_libs_list list(APPEND qt_libs_list
"${qt_loc}/lib/${qt_lib_objects}/Gui_resources_1/.rcc/qrc_qpdf.cpp.o" $<TARGET_OBJECTS:Qt6::Gui_resources_1>
"${qt_loc}/lib/${qt_lib_objects}/Widgets_resources_1/.rcc/qrc_qstyle.cpp.o" $<TARGET_OBJECTS:Qt6::Widgets_resources_1>
"${qt_loc}/lib/${qt_lib_objects}/Widgets_resources_2/.rcc/qrc_qstyle1.cpp.o" $<TARGET_OBJECTS:Qt6::Widgets_resources_2>
"${qt_loc}/lib/${qt_lib_objects}/Widgets_resources_3/.rcc/qrc_qmessagebox.cpp.o" $<TARGET_OBJECTS:Qt6::Widgets_resources_3>
) )
target_link_libraries(external_qt target_link_libraries(external_qt