From d9a73e30cb3386f6226c2c7c65eb36cfb2eb0691 Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Thu, 29 Aug 2024 20:44:18 -0700 Subject: [PATCH] CMake: 3.24+ --- ExampleCodes/CMakeLists.txt | 18 +++++++++--------- .../HeatEquation/Exec/CMakeLists.txt | 2 +- .../HeatEquation_Simple/CMakeLists.txt | 2 +- GuidedTutorials/HelloWorld/CMakeLists.txt | 2 +- GuidedTutorials/MultiFab/CMakeLists.txt | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/ExampleCodes/CMakeLists.txt b/ExampleCodes/CMakeLists.txt index 736d93e9..ae0df66e 100644 --- a/ExampleCodes/CMakeLists.txt +++ b/ExampleCodes/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.14) +cmake_minimum_required(VERSION 3.24) project( AMReX-Tutorials DESCRIPTION "Tutorials for the AMReX adaptive mesh refinement framework" @@ -51,6 +51,14 @@ if( NOT DEFINED AMReX_DIR ) set(AMReX_GIT_BRANCH "development" CACHE STRING "The AMReX branch to checkout") set(AMReX_INSTALL "NO" CACHE INTERNAL "Disable install target for amrex") + if(AMReX_FORTRAN) + enable_language(Fortran) + endif () + + if(AMReX_GPU_BACKEND STREQUAL "CUDA") + enable_language(CUDA) + endif() + include(FetchContent) set(FETCHCONTENT_QUIET OFF) # Verbose ON @@ -164,10 +172,6 @@ endif () if(AMReX_GPU_BACKEND STREQUAL "CUDA") enable_language(CUDA) - # AMReX 21.06+ supports CUDA_ARCHITECTURES - if(CMAKE_VERSION VERSION_LESS 3.20) - include(AMReX_SetupCUDA) - endif() endif() endif() else() @@ -178,10 +182,6 @@ else() if(AMReX_GPU_BACKEND STREQUAL "CUDA") enable_language(CUDA) - # AMReX 21.06+ supports CUDA_ARCHITECTURES - if(CMAKE_VERSION VERSION_LESS 3.20) - include(AMReX_SetupCUDA) - endif() endif() endif() diff --git a/GuidedTutorials/HeatEquation/Exec/CMakeLists.txt b/GuidedTutorials/HeatEquation/Exec/CMakeLists.txt index 578f8df5..df317516 100644 --- a/GuidedTutorials/HeatEquation/Exec/CMakeLists.txt +++ b/GuidedTutorials/HeatEquation/Exec/CMakeLists.txt @@ -28,7 +28,7 @@ # For additional CMake compile options see # https://amrex-codes.github.io/amrex/docs_html/BuildingAMReX.html#building-with-cmake -cmake_minimum_required(VERSION 3.16) +cmake_minimum_required(VERSION 3.24) ## Project name and source file languages project(HeatEquation_EX0 diff --git a/GuidedTutorials/HeatEquation_Simple/CMakeLists.txt b/GuidedTutorials/HeatEquation_Simple/CMakeLists.txt index fb5c2d43..02e65312 100644 --- a/GuidedTutorials/HeatEquation_Simple/CMakeLists.txt +++ b/GuidedTutorials/HeatEquation_Simple/CMakeLists.txt @@ -24,7 +24,7 @@ # For additional CMake compile options see # https://amrex-codes.github.io/amrex/docs_html/BuildingAMReX.html#building-with-cmake -cmake_minimum_required(VERSION 3.16) +cmake_minimum_required(VERSION 3.24) # Project name and source file languages project(HeatEquation_Simple diff --git a/GuidedTutorials/HelloWorld/CMakeLists.txt b/GuidedTutorials/HelloWorld/CMakeLists.txt index 68fe3b4e..533c7f10 100644 --- a/GuidedTutorials/HelloWorld/CMakeLists.txt +++ b/GuidedTutorials/HelloWorld/CMakeLists.txt @@ -26,7 +26,7 @@ -cmake_minimum_required(VERSION 3.16) +cmake_minimum_required(VERSION 3.24) # Project name and source file language project(HelloWorld diff --git a/GuidedTutorials/MultiFab/CMakeLists.txt b/GuidedTutorials/MultiFab/CMakeLists.txt index e54b1295..2626db12 100644 --- a/GuidedTutorials/MultiFab/CMakeLists.txt +++ b/GuidedTutorials/MultiFab/CMakeLists.txt @@ -26,7 +26,7 @@ -cmake_minimum_required(VERSION 3.16) +cmake_minimum_required(VERSION 3.24) # Project name and source file language project(MultiFab