mx/Jungfraujoch
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 33 Wiki Activity

v1.0.0-rc.96 #1

Merged
leonarski_f merged 33 commits from 2510-viewer-improvements into main 2025-11-02 13:45:58 +01:00
Conversation 0 Commits 33 Files Changed 181 +8 -5
4 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 3b73a729be - Show all commits

5
docker/rocky8/Dockerfile
View File

@@ -53,6 +53,7 @@ RUN dnf -y update && \
mesa-libEGL-devel \
dbus-devel \
zlib-devel \
zlib-static \
glib2-devel \
fftw-static \
fftw-devel \
@@ -166,7 +167,7 @@ RUN set -eux; \
rm -rf /tmp/hdf5-src
ENV CMAKE_PREFIX_PATH=/opt/libtiff-${LIBTIFF_VERSION}-static:/opt/libjpeg-turbo-${LIBJPEG_TURBO_VERSION}-static
ENV PKG_CONFIG_PATH=/opt/hdf5-${HDF5_TAG}-static/lib/pkgconfig:/opt/libjpeg-turbo-${LIBJPEG_TURBO_TAG}-static/lib/pkgconfig:/opt/libtiff-${LIBTIFF_TAG}-static/lib/pkgconfig:${OPENSSL_ROOT_DIR}/lib/pkgconfig:${OPENSSL_ROOT_DIR}/lib64/pkgconfig
ENV PKG_CONFIG_PATH=/opt/hdf5-${HDF5_TAG}-static/lib/pkgconfig:/opt/libjpeg-turbo-${LIBJPEG_TURBO_VERSION}-static/lib/pkgconfig:/opt/libtiff-${LIBTIFF_VERSION}-static/lib/pkgconfig:${OPENSSL_ROOT_DIR}/lib/pkgconfig:${OPENSSL_ROOT_DIR}/lib64/pkgconfig
ARG QT_PREFIX=/opt/qt-${QT_VERSION}-static
RUN set -eux; \
@@ -200,7 +201,7 @@ RUN set -eux; \
cmake --install .; \
cd /; rm -rf /tmp/qt-everywhere-src-${QT_VERSION} /tmp/qt-everywhere-src-${QT_VERSION}.tar.xz
ENV CMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}:/opt/hdf5-${HDF5_TAG}-static:opt/qt-${QT_VERSION}-static:/opt/eigen
ENV CMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}:/opt/hdf5-${HDF5_TAG}-static:/opt/qt-${QT_VERSION}-static:/opt/eigen
# Set workdir for your project
WORKDIR /workspace

3
docker/rocky9/Dockerfile
View File

@@ -54,6 +54,7 @@ RUN dnf -y update && \
mesa-libEGL-devel \
dbus-devel \
zlib-devel \
zlib-static \
glib2-devel \
fftw-static \
fftw-devel \
@@ -148,7 +149,7 @@ RUN set -eux; \
rm -rf /tmp/hdf5-src
ENV CMAKE_PREFIX_PATH=/opt/libtiff-${LIBTIFF_VERSION}-static:/opt/libjpeg-turbo-${LIBJPEG_TURBO_VERSION}-static
ENV PKG_CONFIG_PATH=/opt/hdf5-${HDF5_TAG}-static/lib/pkgconfig:/opt/libjpeg-turbo-${LIBJPEG_TURBO_TAG}-static/lib/pkgconfig:/opt/libtiff-${LIBTIFF_TAG}-static/lib/pkgconfig:${OPENSSL_ROOT_DIR}/lib/pkgconfig:${OPENSSL_ROOT_DIR}/lib64/pkgconfig
ENV PKG_CONFIG_PATH=/opt/hdf5-${HDF5_TAG}-static/lib/pkgconfig:/opt/libjpeg-turbo-${LIBJPEG_TURBO_VERSION}-static/lib/pkgconfig:/opt/libtiff-${LIBTIFF_VERSION}-static/lib/pkgconfig:${OPENSSL_ROOT_DIR}/lib/pkgconfig:${OPENSSL_ROOT_DIR}/lib64/pkgconfig
# Make GCC/G++ 13 the default for builds
ENV GCC_TOOLSET_ROOT=/opt/rh/gcc-toolset-13/root

2
docker/ubuntu2204/Dockerfile
View File

@@ -166,7 +166,7 @@ RUN set -eux; \
ENV CMAKE_PREFIX_PATH=/opt/libtiff-${LIBTIFF_VERSION}-static:/opt/libjpeg-turbo-${LIBJPEG_TURBO_VERSION}-static
ENV PKG_CONFIG_PATH=/opt/hdf5-${HDF5_TAG}-static/lib/pkgconfig:/opt/libjpeg-turbo-${LIBJPEG_TURBO_TAG}-static/lib/pkgconfig:/opt/libtiff-${LIBTIFF_TAG}-static/lib/pkgconfig:${OPENSSL_ROOT_DIR}/lib/pkgconfig:${OPENSSL_ROOT_DIR}/lib64/pkgconfig
ENV PKG_CONFIG_PATH=/opt/hdf5-${HDF5_TAG}-static/lib/pkgconfig:/opt/libjpeg-turbo-${LIBJPEG_TURBO_VERSION}-static/lib/pkgconfig:/opt/libtiff-${LIBTIFF_VERSION}-static/lib/pkgconfig:${OPENSSL_ROOT_DIR}/lib/pkgconfig:${OPENSSL_ROOT_DIR}/lib64/pkgconfig
# Use GCC/G++ 12 for builds
ENV CC=/usr/bin/gcc-12

3
docker/ubuntu2404/Dockerfile
View File

@@ -120,7 +120,8 @@ RUN set -eux; \
# Expose static OpenSSL to CMake/pkg-config
ENV OPENSSL_ROOT_DIR=/opt/openssl-${OPENSSL_VERSION}
ENV PKG_CONFIG_PATH=${OPENSSL_ROOT_DIR}/lib/pkgconfig:${OPENSSL_ROOT_DIR}/lib64/pkgconfig:/opt/hdf5-${HDF5_TAG}-static
ENV CMAKE_PROFILE_PATH=/opt/hdf5-${HDF5_TAG}-static:${OPENSSL_ROOT_DIR}
ENV PKG_CONFIG_PATH=${OPENSSL_ROOT_DIR}/lib/pkgconfig:${OPENSSL_ROOT_DIR}/lib64/pkgconfig:/opt/hdf5-${HDF5_TAG}-static/lib/pkgconfig
# Set workdir for your project
WORKDIR /workspace