Adds latest migration results
This commit is contained in:
829 files changed
+35074
-70886
No files matched your search
@@ -12,7 +12,10 @@ ELSE()
|
||||
SET(SCHUSSTAFEL_FOUND FALSE)
|
||||
ENDIF()
|
||||
|
||||
FIND_PACKAGE(ArcGIS REQUIRED)
|
||||
FIND_PACKAGE(ArcGIS)
|
||||
IF(NOT ARCGIS_FOUND)
|
||||
SET(BUILD_ARCGIS OFF CACHE BOOL "Build ArcGIS SDK dependent modules" FORCE)
|
||||
ENDIF()
|
||||
|
||||
INCLUDE(MacroRTIDDSGen)
|
||||
INCLUDE(MacroCodeGenIdl)
|
||||
@@ -126,8 +129,8 @@ NGL_TARGET_LINK_LIBRARIES(svcCesDDSCommon
|
||||
LtsUtilsCore
|
||||
ngltools
|
||||
BuildingControlVwm
|
||||
ArcGISQt5Hack
|
||||
ArcGIS::ArcGIS
|
||||
$<IF:$<TARGET_EXISTS:ArcGISQt5Hack>,ArcGISQt5Hack,>
|
||||
$<IF:$<AND:$<BOOL:${ARCGIS_FOUND}>,$<TARGET_EXISTS:ArcGIS::ArcGIS>>,ArcGIS::ArcGIS,>
|
||||
)
|
||||
NGL_INSTALL_TARGET(svcCesDDSCommon)
|
||||
|
||||
@@ -248,7 +251,7 @@ ENDIF()
|
||||
NGL_ADD_SVC_ICON(SRCS_exe)
|
||||
NGL_ADD_EXECUTABLE(AAR SV svcCentralEffectSimulation ${SRCS_exe})
|
||||
NGL_TARGET_LINK_LIBRARIES(svcCentralEffectSimulation
|
||||
ArcGISQt5Hack # make sure it's loaded *before* libEsriCommonQt.so
|
||||
$<IF:$<TARGET_EXISTS:ArcGISQt5Hack>,ArcGISQt5Hack,>
|
||||
Qt6::Core
|
||||
Qt6::Network
|
||||
nglcoreapplication
|
||||
|
||||
Reference in new issue
Block a user