Adds succesfull lts/proxies migration & testsuite
This commit is contained in:
59 files changed
+754
-273
No files matched your search
+12
-5
@@ -4,16 +4,20 @@
|
||||
# $Author:
|
||||
#
|
||||
|
||||
# Make ${Qt6_WebSockets} optional
|
||||
if(QT6_GUI_AVAILABLE AND TARGET Qt6::WebSockets)
|
||||
set(Qt6_WebSockets ${Qt6_WebSockets})
|
||||
# Make ${Qt6_WebSockets} optional (doesn't require GUI)
|
||||
if(TARGET Qt6::WebSockets)
|
||||
set(Qt6_WebSockets Qt6::WebSockets)
|
||||
set(BUILDINGCONTROLJSON_AVAILABLE TRUE)
|
||||
else()
|
||||
set(Qt6_WebSockets "")
|
||||
set(BUILDINGCONTROLJSON_AVAILABLE FALSE)
|
||||
endif()
|
||||
|
||||
|
||||
ADD_SUBDIRECTORY(BSM)
|
||||
ADD_SUBDIRECTORY(Json)
|
||||
if(BUILDINGCONTROLJSON_AVAILABLE)
|
||||
ADD_SUBDIRECTORY(Json)
|
||||
endif()
|
||||
ADD_SUBDIRECTORY(VWM)
|
||||
ADD_SUBDIRECTORY(ControlEffects)
|
||||
|
||||
@@ -51,6 +55,9 @@ NGL_TARGET_LINK_LIBRARIES(BuildingControlCommon
|
||||
NGL_TARGET_INCLUDE_DIRECTORIES(BuildingControlCommon
|
||||
PUBLIC
|
||||
${CMAKE_CURRENT_SOURCE_DIR}
|
||||
${CMAKE_BINARY_DIR}/Lts/Proxies/Buildings/BuildingControlUnit
|
||||
${CMAKE_SOURCE_DIR}/Lts/Proxies/TrainingAreaBase
|
||||
${CMAKE_BINARY_DIR}/Lts/Proxies/TrainingAreaBase
|
||||
)
|
||||
|
||||
NGL_ADD_EXECUTABLE(AAR SV BuildingControlUnit ${bc_SRCS})
|
||||
@@ -63,7 +70,7 @@ NGL_TARGET_LINK_LIBRARIES(BuildingControlUnit
|
||||
Qt6::Concurrent
|
||||
BuildingControlBsm
|
||||
BuildingControlCommon
|
||||
BuildingControlJson
|
||||
$<$<BOOL:${BUILDINGCONTROLJSON_AVAILABLE}>:BuildingControlJson>
|
||||
BuildingControlVwm
|
||||
ControlEffects
|
||||
LtsCommandLineParser
|
||||
|
||||
Reference in new issue
Block a user