Skip to content

ci(ubuntu22): drop the apt.kitware.com CMake upgrade step #5963

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Fedr merged 4 commits into from
Apr 23, 2026
+6 −15
Merged

ci(ubuntu22): drop the apt.kitware.com CMake upgrade step #5963

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
31a41b4
ci(ubuntu22): drop the apt.kitware.com CMake upgrade step
Fedr Apr 23, 2026
a47a6a1
ConfigureCuda: fall back to CUDA_STANDARD=17 when CMake < 3.26
Fedr Apr 23, 2026
69db5ef
ConfigureCuda: tighten CUDA20 gate to CMake 3.25.2 (not 3.26)
Fedr Apr 23, 2026
70212b8
ConfigureCuda: collapse CUDA20 threshold comment to release-notes link
Fedr Apr 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion cmake/Modules/ConfigureCuda.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,17 @@ IF(NOT CUDAToolkit_FOUND AND NOT CUDA_FOUND)
# For our VS2022 CI:
set(CMAKE_CUDA_FLAGS "${CMAKE_CUDA_FLAGS} -allow-unsupported-compiler -D_ALLOW_COMPILER_AND_STL_VERSION_MISMATCH")
ELSE()
set(CMAKE_CUDA_STANDARD 20)
# CMake's NVCC flag-table entry for C++20 was added in CMake 3.26 (gated
# on NVCC >= 12.0). On older CMake -- notably Ubuntu 22.04 jammy's
# apt-supplied 3.22 -- using CUDA_STANDARD=20 fails at CUDA project
# detection with "does not know the compile flags to use to enable it".
# Fall back to C++17 in that case; MeshLib's CUDA code compiles under
# either standard.
Comment thread
Fedr marked this conversation as resolved.
Outdated
IF(CMAKE_VERSION VERSION_LESS 3.26)
set(CMAKE_CUDA_STANDARD 17)
ELSE()
set(CMAKE_CUDA_STANDARD 20)
ENDIF()
find_package(CUDAToolkit 12 REQUIRED)
ENDIF()
set(CMAKE_CUDA_STANDARD_REQUIRED ON)
Expand Down
14 changes: 0 additions & 14 deletions docker/ubuntu22Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,20 +68,6 @@ RUN export DEBIAN_FRONTEND=noninteractive; \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*

# update cmake
RUN apt remove --purge --auto-remove -y cmake \
&& apt update \
&& apt install -y software-properties-common lsb-release \
&& apt clean all \
&& wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | gpg --dearmor - | tee /etc/apt/trusted.gpg.d/kitware.gpg >/dev/null \
&& apt-add-repository "deb https://apt.kitware.com/ubuntu/ $(lsb_release -cs) main" \
&& apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 42D5A192B819C5DA \
&& apt update \
&& apt install -y kitware-archive-keyring \
&& rm /etc/apt/trusted.gpg.d/kitware.gpg \
&& apt update \
&& apt install -y cmake

RUN ./scripts/install_thirdparty.sh && \
echo '/usr/local/lib' | tee -a /etc/ld.so.conf && \
sudo ldconfig
Expand Down
Loading