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
+6
-2
@@ -146,11 +146,15 @@ 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)
|
||||||
|
|
||||||
|
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_ADD_LIBRARY(WS TOOLSWS TOOLSSV LtsWidgets SHARED ${ltswidgets_SRCS})
|
||||||
|
|
||||||
NGL_TARGET_INCLUDE_DIRECTORIES(LtsWidgets
|
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
|
||||||
@@ -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