From 1e2d7f2790bf946f28bc6b07fdb0ac1b6fb818a6 Mon Sep 17 00:00:00 2001
From: Charles Villard <charles.villard@cea.fr>
Date: Fri, 11 Oct 2024 13:19:30 +0200
Subject: [PATCH] edit: CMakeLists: removed manual CUDA path and upgrade Catch2
version to latest
---
CMakeLists.txt | 7 -------
unit_tests/CMakeLists.txt | 2 +-
2 files changed, 1 insertion(+), 8 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index bea1b39..20bffae 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -60,13 +60,6 @@ endif()
##########
# CUDA
-if(NOT $ENV{AIDGE_INSTALL} STREQUAL "")
- message(WARNING "Env var CIBUILDWHEEL detected : currently building for a release job."
- "\nSetting manually CUDACXX, PATH & LD_LIBRARY_PATH Variables")
- list(APPEND ENV{LD_LIBRARY_PATH} /usr/local/cuda/lib64)
- list(APPEND ENV{PATH} /usr/local/cuda/bin)
- set(ENV{CUDACXX} /usr/local/cuda/bin/nvcc)
-endif()
find_package(CUDAToolkit REQUIRED)
if(NOT DEFINED CMAKE_CUDA_STANDARD)
set(CMAKE_CUDA_STANDARD 14)
diff --git a/unit_tests/CMakeLists.txt b/unit_tests/CMakeLists.txt
index 807adc5..23d5621 100644
--- a/unit_tests/CMakeLists.txt
+++ b/unit_tests/CMakeLists.txt
@@ -1,6 +1,6 @@
Include(FetchContent)
-set(CATCH2_VERSION v3.0.1)
+set(CATCH2_VERSION v3.7.1)
message(STATUS "Retrieving Catch2 ${CATCH2_VERSION} from git")
FetchContent_Declare(
Catch2
--
GitLab