Adds latest migration results
This commit is contained in:
829 files changed
+35074
-70886
No files matched your search
+32
-20
@@ -4,6 +4,14 @@
|
||||
# $Author$
|
||||
#
|
||||
|
||||
# Make ${Qt6_Gui} optional
|
||||
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Gui)
|
||||
set(Qt6_Gui ${Qt6_Gui})
|
||||
else()
|
||||
set(Qt6_Gui "")
|
||||
endif()
|
||||
|
||||
|
||||
SET(vwm_SRCS
|
||||
vwm_api.cpp
|
||||
vwm_api.h
|
||||
@@ -23,16 +31,18 @@ SET(vwm_SRCS
|
||||
)
|
||||
|
||||
NGL_ADD_LIBRARY2(AAR SV BuildingControlVwm SHARED ${vwm_SRCS})
|
||||
NGL_TARGET_LINK_LIBRARIES(BuildingControlVwm
|
||||
PRIVATE
|
||||
ngltools
|
||||
Qt6::Xml
|
||||
PUBLIC
|
||||
Qt6::Core
|
||||
Qt6::Gui
|
||||
LtsUtilsCoreHeaderOnly
|
||||
BuildingControlCommon
|
||||
)
|
||||
if(QT6_GUI_AVAILABLE)
|
||||
NGL_TARGET_LINK_LIBRARIES(BuildingControlVwm
|
||||
PRIVATE
|
||||
ngltools
|
||||
Qt6::Xml
|
||||
PUBLIC
|
||||
Qt6::Core
|
||||
${Qt6_Gui}
|
||||
LtsUtilsCoreHeaderOnly
|
||||
BuildingControlCommon
|
||||
)
|
||||
endif()
|
||||
################################
|
||||
### Test
|
||||
################################
|
||||
@@ -49,15 +59,17 @@ NGL_TARGET_LINK_LIBRARIES(BuildingControlTestVwm
|
||||
LtsCoordTrans
|
||||
)
|
||||
NGL_ADD_EXECUTABLE(AAR SV BuildingControlTestVwmXml test_vwm_xml.cpp)
|
||||
NGL_TARGET_LINK_LIBRARIES(BuildingControlTestVwmXml
|
||||
LtsUtilsCoreHeaderOnly
|
||||
Qt6::Xml
|
||||
Qt6::Core
|
||||
Qt6::Gui
|
||||
BuildingControlVwm
|
||||
BuildingControlCommon
|
||||
nglcoreapplication
|
||||
)
|
||||
if(QT6_GUI_AVAILABLE)
|
||||
NGL_TARGET_LINK_LIBRARIES(BuildingControlTestVwmXml
|
||||
LtsUtilsCoreHeaderOnly
|
||||
Qt6::Xml
|
||||
Qt6::Core
|
||||
${Qt6_Gui}
|
||||
BuildingControlVwm
|
||||
BuildingControlCommon
|
||||
nglcoreapplication
|
||||
)
|
||||
endif()
|
||||
|
||||
IF(BUILD_TESTING AND TARGET BuildingControlVwm)
|
||||
SET(test_SRCS
|
||||
@@ -66,7 +78,7 @@ IF(BUILD_TESTING AND TARGET BuildingControlVwm)
|
||||
)
|
||||
ADD_EXECUTABLE(bld_vwm_math_unit_test ${test_SRCS})
|
||||
TARGET_LINK_LIBRARIES(bld_vwm_math_unit_test
|
||||
Qt6::Gui
|
||||
${Qt6_Gui}
|
||||
Qt6::Core
|
||||
Qt6::Test
|
||||
BuildingControlVwm
|
||||
|
||||
Reference in new issue
Block a user