Atempt to fix designerr CMake build (2)

hicknhack-software · Apr 26, 2024 · 8919e5e · 8919e5e
1 parent ca738bb
commit 8919e5e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/plugins/qmldesigner/CMakeLists.txt b/src/plugins/qmldesigner/CMakeLists.txt
@@ -51,6 +51,11 @@ extend_qtc_library(QmlDesignerUtils
     PROPERTIES COMPILE_WARNING_AS_ERROR ON
 )
 
+# remove interface compile definition (add_qtc_library seems wrong)
+get_target_property(defs QmlDesignerUtils INTERFACE_COMPILE_DEFINITIONS)
+list(FILTER defs EXCLUDE REGEX [[^QMLDESIGNERUTILS_LIBRARY$]])
+set_property(TARGET QmlDesignerUtils PROPERTY INTERFACE_COMPILE_DEFINITIONS ${defs})
+
 add_qtc_library(QmlDesignerCore STATIC
   CONDITION TARGET QmlDesignerBase AND TARGET Qt6::QmlPrivate AND TARGET Qt6::QmlDomPrivate AND TARGET Qt6::QmlCompilerPrivate
   EXCLUDE_FROM_INSTALL

diff --git a/src/plugins/qmldesigner/qmldesignerplugin.qbs b/src/plugins/qmldesigner/qmldesignerplugin.qbs
@@ -42,7 +42,6 @@ QtcPlugin {
         "QMLDESIGNERUTILS_LIBRARY",
         "QMLDESIGNER_LIBRARY",
         "QMLDESIGNERCORE_LIBRARY",
-        "QMLDESIGNERUTILS_LIBRARY",
         "QMLDESIGNERCOMPONENTS_LIBRARY",
     ])
     cpp.enableExceptions: true