Fix LtsWidgets BUILD_RTI conditional and include paths

- Wrap entire LtsWidgets library definition in IF(BUILD_RTI) conditional - Add CMAKE_BINARY_DIR/Lts/Common/LtsUtils/LtsUtilsCore to include paths for export header - Add debug MESSAGE for build troubleshooting Part of Qt6 migration with BUILD_RTI support.
2026-08-19 00:11:06 +02:00
1 parent 6a2a0667ab
commit 514ded2739
@@ -146,55 +146,60 @@ NGL_WRAP_UI(ltswidgets_SRCS
 )

 NGL_ADD_BIG_RESOURCES(ltswidgets_SRCS resources/lts_resources.qrc)
-NGL_ADD_LIBRARY(WS TOOLSWS TOOLSSV LtsWidgets SHARED ${ltswidgets_SRCS})

-NGL_TARGET_INCLUDE_DIRECTORIES(LtsWidgets
-  PUBLIC
-    ${CMAKE_CURRENT_SOURCE_DIR}/../
-)
+IF(BUILD_RTI)
+  MESSAGE(STATUS "DEBUG: BUILD_RTI=${BUILD_RTI}, BUILD_WS=${BUILD_WS}, building LtsWidgets")
+  NGL_ADD_LIBRARY(WS TOOLSWS TOOLSSV LtsWidgets SHARED ${ltswidgets_SRCS})

-NGL_TARGET_LINK_LIBRARIES(LtsWidgets
-  PRIVATE
-    Qt6::Network # for QHostInfo - for portability
-    Qt6::Svg
-    ngltools
-    ngltranslator
-    TabBarTabStyle
-    LtsSessionData
-    LtsUtilsSettings
-  PUBLIC
-    LtsUtilsCore
-    Qt6::Core
-    Qt6::Widgets
-    Qt6::Gui
-)
-
-NGL_INSTALL_TARGET(LtsWidgets)
-
-#
-# Designer-Plugin
-#
-SET(ltswidgetsplugin_SRCS ltswidgetsplugin.cpp ltswidgetsplugin.json)
-NGL_ADD_LIBRARY(WS ltswidgetsplugin MODULE ${ltswidgetsplugin_SRCS})
-NGL_TARGET_LINK_LIBRARIES(ltswidgetsplugin LtsWidgets ltsCoordWidget LtsDataView LtsFileDialog LtsReportDisplay svcFlmCommon)
-NGL_SET_TARGET_PROPERTIES(ltswidgetsplugin PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib/designer)
-NGL_INSTALL_TARGET(ltswidgetsplugin DESTINATION lib/designer COMPONENT Devel)
-
-IF(BUILD_TESTING)
-  # picture_editing_test
-  SET(pet_SRCS
-    tests/lts_picture_editing.cpp
-    tests/lts_picture_editing.h
-    tests/lts_picture_editing_main.cpp
-  )
-  NGL_WRAP_UI(pet_SRCS
-    tests/lts_picture_editing.ui
-  )
-  NGL_ADD_EXECUTABLE(WS NO_TRANSLATION picture_editing_test ${pet_SRCS})
-  NGL_TARGET_LINK_LIBRARIES(picture_editing_test
-    LtsWidgets
+  NGL_TARGET_INCLUDE_DIRECTORIES(LtsWidgets
+    PUBLIC
+      ${CMAKE_CURRENT_SOURCE_DIR}/../
+      ${CMAKE_BINARY_DIR}/Lts/Common/LtsUtils/LtsUtilsCore
  )

+  NGL_TARGET_LINK_LIBRARIES(LtsWidgets
+    PRIVATE
+      Qt6::Network # for QHostInfo - for portability
+      Qt6::Svg
+      ngltools
+      ngltranslator
+      TabBarTabStyle
+      LtsSessionData
+      LtsUtilsSettings
+    PUBLIC
+      LtsUtilsCore
+      Qt6::Core
+      Qt6::Widgets
+      Qt6::Gui
+  )
+
+  NGL_INSTALL_TARGET(LtsWidgets)
+
+  #
+  # Designer-Plugin
+  #
+  SET(ltswidgetsplugin_SRCS ltswidgetsplugin.cpp ltswidgetsplugin.json)
+  NGL_ADD_LIBRARY(WS ltswidgetsplugin MODULE ${ltswidgetsplugin_SRCS})
+  NGL_TARGET_LINK_LIBRARIES(ltswidgetsplugin LtsWidgets ltsCoordWidget LtsDataView LtsFileDialog LtsReportDisplay svcFlmCommon)
+  NGL_SET_TARGET_PROPERTIES(ltswidgetsplugin PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib/designer)
+  NGL_INSTALL_TARGET(ltswidgetsplugin DESTINATION lib/designer COMPONENT Devel)
+
+  IF(BUILD_TESTING)
+    # picture_editing_test
+    SET(pet_SRCS
+      tests/lts_picture_editing.cpp
+      tests/lts_picture_editing.h
+      tests/lts_picture_editing_main.cpp
+    )
+    NGL_WRAP_UI(pet_SRCS
+      tests/lts_picture_editing.ui
+    )
+    NGL_ADD_EXECUTABLE(WS NO_TRANSLATION picture_editing_test ${pet_SRCS})
+    NGL_TARGET_LINK_LIBRARIES(picture_editing_test
+      LtsWidgets
+    )
+  ENDIF()
+ENDIF(BUILD_RTI)

 #  # LtsWidgetsTest
 #  SET(src_test
@@ -207,4 +212,3 @@ IF(BUILD_TESTING)
 #  NGL_TARGET_LINK_LIBRARIES(LtsWidgetsTest
 #    LtsWidgets
 #  )
-ENDIF()