Adds succesfull lts/proxies migration & testsuite
This commit is contained in:
59 files changed
+754
-273
No files matched your search
@@ -11,8 +11,8 @@ else()
|
||||
set(Qt6_Gui "")
|
||||
endif()
|
||||
|
||||
# Make ${Qt6_WebSockets} optional
|
||||
if(QT6_GUI_AVAILABLE AND TARGET Qt6::WebSockets)
|
||||
# Make ${Qt6_WebSockets} optional (doesn't require GUI)
|
||||
if(TARGET Qt6::WebSockets)
|
||||
set(Qt6_WebSockets ${Qt6_WebSockets})
|
||||
else()
|
||||
set(Qt6_WebSockets "")
|
||||
@@ -118,6 +118,10 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcBldServer
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/../
|
||||
${CMAKE_CURRENT_BINARY_DIR}/../
|
||||
)
|
||||
NGL_TARGET_COMPILE_DEFINITIONS(svcBldServer
|
||||
PRIVATE
|
||||
MAKE_SVCBLDSERVER_LIB
|
||||
)
|
||||
|
||||
IF(BUILD_RTI)
|
||||
NGL_TARGET_LINK_LIBRARIES(svcBldServer
|
||||
@@ -127,6 +131,7 @@ NGL_TARGET_LINK_LIBRARIES(svcBldServer
|
||||
ddsfts
|
||||
PUBLIC
|
||||
svcBldCommon
|
||||
svcTabCommon
|
||||
ngldb
|
||||
)
|
||||
ENDIF(BUILD_RTI)
|
||||
|
||||
Reference in new issue
Block a user