From 50c4a6fbc0a29a28927b65aa5ce3bc4f178e20c9 Mon Sep 17 00:00:00 2001 From: Torsten Wierschin Date: Fri, 11 Sep 2026 17:17:00 +0000 Subject: [PATCH] Strictly resolve CMake warnings in the Docker build. --- qt6-after/qt6-migrated-legatus/CMakeLists.txt | 26 ++++++++++--------- .../CentralEffectSimulation/CMakeLists.txt | 10 ++++--- .../qt6-migrated-legatus/docker_build.sh | 7 +++-- 3 files changed, 26 insertions(+), 17 deletions(-) diff --git a/qt6-after/qt6-migrated-legatus/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/CMakeLists.txt index 0018ee7ab..d81863fb2 100755 --- a/qt6-after/qt6-migrated-legatus/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/CMakeLists.txt @@ -153,18 +153,20 @@ IF(WIN32) LIST(APPEND CMAKE_PREFIX_PATH "${EXTERNAL_LIBRARY_DIR}") LIST(APPEND CMAKE_PROGRAM_PATH "${EXTERNAL_LIBRARY_DIR}/bin;${EXTERNAL_LIBRARY_DIR}/dev-utils/bin") ELSE() - # Linux: ArcGIS SDK Pfad konfigurieren - # Use environment variable ARCGIS_ROOT if set, otherwise default to /repo/external/... - IF(DEFINED ENV{ARCGIS_ROOT}) - SET(ARCGIS_SDK_DIR "$ENV{ARCGIS_ROOT}" CACHE STRING "ArcGIS Runtime SDK for Qt directory") - ELSE() - SET(ARCGIS_SDK_DIR "/repo/external/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk" CACHE STRING "ArcGIS Runtime SDK for Qt directory") - ENDIF() - IF(EXISTS "${ARCGIS_SDK_DIR}") - LIST(APPEND CMAKE_PREFIX_PATH "${ARCGIS_SDK_DIR}") - MESSAGE(STATUS "ArcGIS SDK found at: ${ARCGIS_SDK_DIR}") - ELSE() - MESSAGE(WARNING "ArcGIS SDK not found at: ${ARCGIS_SDK_DIR}") + # Linux: ArcGIS SDK Pfad konfigurieren (nur wenn BUILD_ARCGIS=ON) + IF(BUILD_ARCGIS) + # Use environment variable ARCGIS_ROOT if set, otherwise default to /repo/external/... + IF(DEFINED ENV{ARCGIS_ROOT}) + SET(ARCGIS_SDK_DIR "$ENV{ARCGIS_ROOT}" CACHE STRING "ArcGIS Runtime SDK for Qt directory") + ELSE() + SET(ARCGIS_SDK_DIR "/repo/external/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk" CACHE STRING "ArcGIS Runtime SDK for Qt directory") + ENDIF() + IF(EXISTS "${ARCGIS_SDK_DIR}") + LIST(APPEND CMAKE_PREFIX_PATH "${ARCGIS_SDK_DIR}") + MESSAGE(STATUS "ArcGIS SDK found at: ${ARCGIS_SDK_DIR}") + ELSE() + MESSAGE(WARNING "ArcGIS SDK not found at: ${ARCGIS_SDK_DIR}") + ENDIF() ENDIF() ENDIF() diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/CMakeLists.txt index 469112de5..b3e04d302 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/CMakeLists.txt @@ -12,9 +12,13 @@ ELSE() SET(SCHUSSTAFEL_FOUND FALSE) ENDIF() -FIND_PACKAGE(ArcGIS) -IF(NOT ARCGIS_FOUND) - SET(BUILD_ARCGIS OFF CACHE BOOL "Build ArcGIS SDK dependent modules" FORCE) +IF(BUILD_ARCGIS) + FIND_PACKAGE(ArcGIS) + IF(NOT ARCGIS_FOUND) + SET(BUILD_ARCGIS OFF CACHE BOOL "Build ArcGIS SDK dependent modules" FORCE) + ENDIF() +ELSE() + SET(ARCGIS_FOUND FALSE) ENDIF() INCLUDE(MacroRTIDDSGen) diff --git a/qt6-after/qt6-migrated-legatus/docker_build.sh b/qt6-after/qt6-migrated-legatus/docker_build.sh index 52f7f65aa..6fc5f39cc 100755 --- a/qt6-after/qt6-migrated-legatus/docker_build.sh +++ b/qt6-after/qt6-migrated-legatus/docker_build.sh @@ -20,11 +20,14 @@ docker run --rm \ qt6-tools-dev \ qt6-l10n-tools \ libgtest-dev \ + libpq-dev \ + postgresql-server-dev-all \ git > /dev/null 2>&1 - # Set RTI license and Qt6 path + # Set RTI license export RTI_LICENSE_FILE=/workspace/rti_license.dat - export CMAKE_PREFIX_PATH=/opt/Qt/6.10.2/gcc_64 + + # Qt6 is installed via apt - CMake finds it automatically in /usr/lib/x86_64-linux-gnu/cmake # Clean and configure rm -rf build4