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.
This commit is contained in:
1 file changed
+21
-17
@@ -146,14 +146,18 @@ NGL_WRAP_UI(ltswidgets_SRCS
|
|||||||
)
|
)
|
||||||
|
|
||||||
NGL_ADD_BIG_RESOURCES(ltswidgets_SRCS resources/lts_resources.qrc)
|
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
|
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_INCLUDE_DIRECTORIES(LtsWidgets
|
||||||
PUBLIC
|
PUBLIC
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/../
|
${CMAKE_CURRENT_SOURCE_DIR}/../
|
||||||
)
|
${CMAKE_BINARY_DIR}/Lts/Common/LtsUtils/LtsUtilsCore
|
||||||
|
)
|
||||||
|
|
||||||
NGL_TARGET_LINK_LIBRARIES(LtsWidgets
|
NGL_TARGET_LINK_LIBRARIES(LtsWidgets
|
||||||
PRIVATE
|
PRIVATE
|
||||||
Qt6::Network # for QHostInfo - for portability
|
Qt6::Network # for QHostInfo - for portability
|
||||||
Qt6::Svg
|
Qt6::Svg
|
||||||
@@ -167,20 +171,20 @@ NGL_TARGET_LINK_LIBRARIES(LtsWidgets
|
|||||||
Qt6::Core
|
Qt6::Core
|
||||||
Qt6::Widgets
|
Qt6::Widgets
|
||||||
Qt6::Gui
|
Qt6::Gui
|
||||||
)
|
)
|
||||||
|
|
||||||
NGL_INSTALL_TARGET(LtsWidgets)
|
NGL_INSTALL_TARGET(LtsWidgets)
|
||||||
|
|
||||||
#
|
#
|
||||||
# Designer-Plugin
|
# Designer-Plugin
|
||||||
#
|
#
|
||||||
SET(ltswidgetsplugin_SRCS ltswidgetsplugin.cpp ltswidgetsplugin.json)
|
SET(ltswidgetsplugin_SRCS ltswidgetsplugin.cpp ltswidgetsplugin.json)
|
||||||
NGL_ADD_LIBRARY(WS ltswidgetsplugin MODULE ${ltswidgetsplugin_SRCS})
|
NGL_ADD_LIBRARY(WS ltswidgetsplugin MODULE ${ltswidgetsplugin_SRCS})
|
||||||
NGL_TARGET_LINK_LIBRARIES(ltswidgetsplugin LtsWidgets ltsCoordWidget LtsDataView LtsFileDialog LtsReportDisplay svcFlmCommon)
|
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_SET_TARGET_PROPERTIES(ltswidgetsplugin PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib/designer)
|
||||||
NGL_INSTALL_TARGET(ltswidgetsplugin DESTINATION lib/designer COMPONENT Devel)
|
NGL_INSTALL_TARGET(ltswidgetsplugin DESTINATION lib/designer COMPONENT Devel)
|
||||||
|
|
||||||
IF(BUILD_TESTING)
|
IF(BUILD_TESTING)
|
||||||
# picture_editing_test
|
# picture_editing_test
|
||||||
SET(pet_SRCS
|
SET(pet_SRCS
|
||||||
tests/lts_picture_editing.cpp
|
tests/lts_picture_editing.cpp
|
||||||
@@ -194,7 +198,8 @@ IF(BUILD_TESTING)
|
|||||||
NGL_TARGET_LINK_LIBRARIES(picture_editing_test
|
NGL_TARGET_LINK_LIBRARIES(picture_editing_test
|
||||||
LtsWidgets
|
LtsWidgets
|
||||||
)
|
)
|
||||||
|
ENDIF()
|
||||||
|
ENDIF(BUILD_RTI)
|
||||||
|
|
||||||
# # LtsWidgetsTest
|
# # LtsWidgetsTest
|
||||||
# SET(src_test
|
# SET(src_test
|
||||||
@@ -207,4 +212,3 @@ IF(BUILD_TESTING)
|
|||||||
# NGL_TARGET_LINK_LIBRARIES(LtsWidgetsTest
|
# NGL_TARGET_LINK_LIBRARIES(LtsWidgetsTest
|
||||||
# LtsWidgets
|
# LtsWidgets
|
||||||
# )
|
# )
|
||||||
ENDIF()
|
|
||||||
Reference in new issue
Block a user