Strictly resolve CMake warnings in the Docker build.
This commit is contained in:
3 files changed
+26
-17
No files matched your search
@@ -153,18 +153,20 @@ IF(WIN32)
|
|||||||
LIST(APPEND CMAKE_PREFIX_PATH "${EXTERNAL_LIBRARY_DIR}")
|
LIST(APPEND CMAKE_PREFIX_PATH "${EXTERNAL_LIBRARY_DIR}")
|
||||||
LIST(APPEND CMAKE_PROGRAM_PATH "${EXTERNAL_LIBRARY_DIR}/bin;${EXTERNAL_LIBRARY_DIR}/dev-utils/bin")
|
LIST(APPEND CMAKE_PROGRAM_PATH "${EXTERNAL_LIBRARY_DIR}/bin;${EXTERNAL_LIBRARY_DIR}/dev-utils/bin")
|
||||||
ELSE()
|
ELSE()
|
||||||
# Linux: ArcGIS SDK Pfad konfigurieren
|
# Linux: ArcGIS SDK Pfad konfigurieren (nur wenn BUILD_ARCGIS=ON)
|
||||||
# Use environment variable ARCGIS_ROOT if set, otherwise default to /repo/external/...
|
IF(BUILD_ARCGIS)
|
||||||
IF(DEFINED ENV{ARCGIS_ROOT})
|
# Use environment variable ARCGIS_ROOT if set, otherwise default to /repo/external/...
|
||||||
SET(ARCGIS_SDK_DIR "$ENV{ARCGIS_ROOT}" CACHE STRING "ArcGIS Runtime SDK for Qt directory")
|
IF(DEFINED ENV{ARCGIS_ROOT})
|
||||||
ELSE()
|
SET(ARCGIS_SDK_DIR "$ENV{ARCGIS_ROOT}" CACHE STRING "ArcGIS Runtime SDK for Qt directory")
|
||||||
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")
|
ELSE()
|
||||||
ENDIF()
|
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")
|
||||||
IF(EXISTS "${ARCGIS_SDK_DIR}")
|
ENDIF()
|
||||||
LIST(APPEND CMAKE_PREFIX_PATH "${ARCGIS_SDK_DIR}")
|
IF(EXISTS "${ARCGIS_SDK_DIR}")
|
||||||
MESSAGE(STATUS "ArcGIS SDK found at: ${ARCGIS_SDK_DIR}")
|
LIST(APPEND CMAKE_PREFIX_PATH "${ARCGIS_SDK_DIR}")
|
||||||
ELSE()
|
MESSAGE(STATUS "ArcGIS SDK found at: ${ARCGIS_SDK_DIR}")
|
||||||
MESSAGE(WARNING "ArcGIS SDK not found at: ${ARCGIS_SDK_DIR}")
|
ELSE()
|
||||||
|
MESSAGE(WARNING "ArcGIS SDK not found at: ${ARCGIS_SDK_DIR}")
|
||||||
|
ENDIF()
|
||||||
ENDIF()
|
ENDIF()
|
||||||
ENDIF()
|
ENDIF()
|
||||||
|
|
||||||
|
|||||||
@@ -12,9 +12,13 @@ ELSE()
|
|||||||
SET(SCHUSSTAFEL_FOUND FALSE)
|
SET(SCHUSSTAFEL_FOUND FALSE)
|
||||||
ENDIF()
|
ENDIF()
|
||||||
|
|
||||||
FIND_PACKAGE(ArcGIS)
|
IF(BUILD_ARCGIS)
|
||||||
IF(NOT ARCGIS_FOUND)
|
FIND_PACKAGE(ArcGIS)
|
||||||
SET(BUILD_ARCGIS OFF CACHE BOOL "Build ArcGIS SDK dependent modules" FORCE)
|
IF(NOT ARCGIS_FOUND)
|
||||||
|
SET(BUILD_ARCGIS OFF CACHE BOOL "Build ArcGIS SDK dependent modules" FORCE)
|
||||||
|
ENDIF()
|
||||||
|
ELSE()
|
||||||
|
SET(ARCGIS_FOUND FALSE)
|
||||||
ENDIF()
|
ENDIF()
|
||||||
|
|
||||||
INCLUDE(MacroRTIDDSGen)
|
INCLUDE(MacroRTIDDSGen)
|
||||||
|
|||||||
@@ -20,11 +20,14 @@ docker run --rm \
|
|||||||
qt6-tools-dev \
|
qt6-tools-dev \
|
||||||
qt6-l10n-tools \
|
qt6-l10n-tools \
|
||||||
libgtest-dev \
|
libgtest-dev \
|
||||||
|
libpq-dev \
|
||||||
|
postgresql-server-dev-all \
|
||||||
git > /dev/null 2>&1
|
git > /dev/null 2>&1
|
||||||
|
|
||||||
# Set RTI license and Qt6 path
|
# Set RTI license
|
||||||
export RTI_LICENSE_FILE=/workspace/rti_license.dat
|
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
|
# Clean and configure
|
||||||
rm -rf build4
|
rm -rf build4
|
||||||
|
|||||||
Reference in new issue
Block a user