migration: prefer ./external for RTI/ArcGIS; detect RTI arch in FindRTI; install/unpack ArcGIS into ./external
This commit is contained in:
1 parent
fe78be0afa
commit
7c080db59f
4 files changed
+42
-18
No files matched your search
+6
-3
@@ -10,7 +10,8 @@ ENV DEBIAN_FRONTEND=noninteractive \
|
||||
QT_BASE_DIR=/opt/Qt \
|
||||
QT_ROOT=/opt/Qt/6.8.3/gcc_64 \
|
||||
Qt6_ROOT=/opt/Qt/6.8.3/gcc_64 \
|
||||
CMAKE_PREFIX_PATH=/usr/local:/opt/Qt/6.8.3/gcc_64 \
|
||||
EXTERNAL_DIR=/repo/external \
|
||||
CMAKE_PREFIX_PATH=/usr/local:/opt/Qt/6.8.3/gcc_64:/repo/external \
|
||||
PATH=/opt/Qt/6.8.3/gcc_64/bin:$PATH
|
||||
|
||||
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
|
||||
@@ -42,6 +43,8 @@ RUN apt-get update \
|
||||
libbz2-dev \
|
||||
libpoppler-dev \
|
||||
libpoppler-qt6-dev \
|
||||
libboost-dev \
|
||||
unzip \
|
||||
python3 \
|
||||
python3-venv \
|
||||
python3-pip \
|
||||
@@ -85,8 +88,8 @@ RUN set -eux; \
|
||||
/app/build_kdreports.sh || true; \
|
||||
# If libgtest-dev provided sources, build+install them via script
|
||||
/app/build_gtest.sh || true; \
|
||||
# geographiclib already installed via apt; RTI (Proprietary) cannot be installed automatically
|
||||
echo "Note: RTI Connext (RTI) is proprietary and must be installed manually into /opt/RTI if required."
|
||||
# geographiclib already installed via apt; RTI and ArcGIS are proprietary and installed externally
|
||||
echo "Note: RTI Connext and ArcGIS Maps SDK are expected to be provided under /repo/external (e.g. /repo/external/rti_connext_dds-7.7.0 and /repo/external/ArcGIS)."
|
||||
|
||||
# Add RPM/rpmbuild tools so make_rpm.py can run inside the image when requested
|
||||
RUN set -eux; \
|
||||
|
||||
Reference in new issue
Block a user