From 05a71e982dbf6b094f99bf5ad987f4ec527363f8 Mon Sep 17 00:00:00 2001 From: Pi03k Date: Sat, 9 Nov 2024 16:34:28 +0100 Subject: [PATCH] Move from qt_wrap_ui to AUTOUIC for qt components lib (#7348) --- components/CMakeLists.txt | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt index 3a0acdae22..b6734e6fc6 100644 --- a/components/CMakeLists.txt +++ b/components/CMakeLists.txt @@ -517,9 +517,6 @@ add_component_dir(testing util ) -set (ESM_UI ${CMAKE_CURRENT_SOURCE_DIR}/contentselector/contentselector.ui - ) - if (USE_QT) add_component_qt_dir (contentselector model/modelitem model/esmfile @@ -558,7 +555,6 @@ if (USE_QT) qtconversion ) - QT_WRAP_UI(ESM_UI_HDR ${ESM_UI}) endif() include_directories(${BULLET_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR}) @@ -619,7 +615,7 @@ endif() target_link_libraries(components ${BULLET_LIBRARIES}) if (USE_QT) - add_library(components_qt STATIC ${COMPONENT_QT_FILES} ${ESM_UI_HDR}) + add_library(components_qt STATIC ${COMPONENT_QT_FILES}) target_link_libraries(components_qt components Qt::Widgets Qt::Core) if (BUILD_LAUNCHER OR BUILD_WIZARD) @@ -692,6 +688,8 @@ endif(OSG_STATIC) if(USE_QT) set_property(TARGET components_qt PROPERTY AUTOMOC ON) + set_property(TARGET components_qt PROPERTY AUTOUIC ON) + set_property(TARGET components_qt PROPERTY AUTOUIC_SEARCH_PATHS contentselector) endif(USE_QT) if (MSVC AND PRECOMPILE_HEADERS_WITH_MSVC)