From 1c01767d4c8760cd62eb57047d7ac8e56de4f058 Mon Sep 17 00:00:00 2001 From: "Wileam Y. Phan" <50928756+wyphan@users.noreply.github.com> Date: Sun, 11 Jul 2021 13:49:01 -0400 Subject: [PATCH 1/3] Use CMake `set` for CMAKE_MAXIMUM_RANK ... because using `option` will make it show up incorrectly as a checkbox in cmake-gui. --- CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e2e50f8fe..1bc642a66 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -49,7 +49,9 @@ check_fortran_source_runs("i=0; error stop i; end" f18errorstop SRC_EXT f90) check_fortran_source_compiles("real, allocatable :: array(:, :, :, :, :, :, :, :, :, :); end" f03rank SRC_EXT f90) check_fortran_source_runs("use, intrinsic :: iso_fortran_env, only : real128; real(real128) :: x; x = x+1; end" f03real128) -option(CMAKE_MAXIMUM_RANK "Maximum array rank for generated procedures" 4) +if(NOT DEFINED CMAKE_MAXIMUM_RANK) + set(CMAKE_MAXIMUM_RANK 4 CACHE STRING "Maximum array rank for generated procedures") +endif() # --- find preprocessor find_program(FYPP fypp) From 7c1e9c9161393837af723ed4e93df17edb70bd0a Mon Sep 17 00:00:00 2001 From: "Wileam Y. Phan" <50928756+wyphan@users.noreply.github.com> Date: Sun, 11 Jul 2021 14:35:36 -0400 Subject: [PATCH 2/3] Update README.md ... to reflect proper CMake cache variable usage. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 096b9d75d..ccc723ff0 100644 --- a/README.md +++ b/README.md @@ -136,7 +136,7 @@ Important options are For example, to configure a build using the Ninja backend and generating procedures up to rank 7, which is installed to your home directory use ```sh -cmake -B build -G Ninja -DCMAKE_MAXIMUM_RANK=7 -DCMAKE_INSTALL_PREFIX=$HOME/.local +cmake -B build -G Ninja -DCMAKE_MAXIMUM_RANK:String=7 -DCMAKE_INSTALL_PREFIX=$HOME/.local ``` To build the standard library run From 6e9e91c2df5bdb868b8162a1de3bbd433f47a336 Mon Sep 17 00:00:00 2001 From: Wileam Phan Date: Sun, 11 Jul 2021 14:39:47 -0400 Subject: [PATCH 3/3] Update CI workflow files --- .github/workflows/CI.yml | 4 ++-- .github/workflows/ci_windows.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 268f82fe1..5fb75e4a8 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -62,7 +62,7 @@ jobs: run: >- cmake -Wdev -DCMAKE_BUILD_TYPE=Release - -DCMAKE_MAXIMUM_RANK=4 + -DCMAKE_MAXIMUM_RANK:String=4 -DCMAKE_INSTALL_PREFIX=$PWD/_dist -S . -B build @@ -179,7 +179,7 @@ jobs: run: >- cmake -Wdev -DCMAKE_BUILD_TYPE=Release - -DCMAKE_MAXIMUM_RANK=4 + -DCMAKE_MAXIMUM_RANK:String=4 -DCMAKE_INSTALL_PREFIX=$PWD/_dist -S . -B build diff --git a/.github/workflows/ci_windows.yml b/.github/workflows/ci_windows.yml index 6b780106d..5da442f59 100644 --- a/.github/workflows/ci_windows.yml +++ b/.github/workflows/ci_windows.yml @@ -64,7 +64,7 @@ jobs: -B build -DCMAKE_BUILD_TYPE=Debug -DCMAKE_Fortran_FLAGS_DEBUG="-Wall -Wextra -Wimplicit-interface -fPIC -g -fcheck=all -fbacktrace" - -DCMAKE_MAXIMUM_RANK=4 + -DCMAKE_MAXIMUM_RANK:String=4 -DCMAKE_INSTALL_PREFIX=$PWD/_dist env: FC: gfortran