diff --git a/cmake/Modules/ConfigureCuda.cmake b/cmake/Modules/ConfigureCuda.cmake index e0591eac9164..8fd200f450b8 100644 --- a/cmake/Modules/ConfigureCuda.cmake +++ b/cmake/Modules/ConfigureCuda.cmake @@ -11,7 +11,12 @@ 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) + # https://cmake.org/cmake/help/latest/release/3.25.html#id2 + IF(CMAKE_VERSION VERSION_LESS 3.25.2) + set(CMAKE_CUDA_STANDARD 17) + ELSE() + set(CMAKE_CUDA_STANDARD 20) + ENDIF() find_package(CUDAToolkit 12 REQUIRED) ENDIF() set(CMAKE_CUDA_STANDARD_REQUIRED ON) diff --git a/docker/ubuntu22Dockerfile b/docker/ubuntu22Dockerfile index 058a0ad4be60..33671b61cab5 100644 --- a/docker/ubuntu22Dockerfile +++ b/docker/ubuntu22Dockerfile @@ -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