From 3b1f92de7378ab2060d0f27c90f11fdd53e23672 Mon Sep 17 00:00:00 2001 From: Alex Richert Date: Thu, 15 Jun 2023 10:40:29 -0700 Subject: [PATCH 1/4] remove hardcoded 'kinds' setting from src/CMakeLists.txt --- src/CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 6877cbaa..f5d8c33f 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -29,7 +29,6 @@ endif() # We build a version of the library with 4-byte reals (_4), and one # with 8-byte reals (_d). -set(kinds "4" "d") foreach(kind ${kinds}) set(lib_name ${PROJECT_NAME}_${kind}) set(module_dir "${CMAKE_CURRENT_BINARY_DIR}/include_${kind}") From c9dffe7ac40d2b3e360e19c9467d2d5b4d93c23a Mon Sep 17 00:00:00 2001 From: Alex Richert Date: Thu, 15 Jun 2023 10:49:24 -0700 Subject: [PATCH 2/4] disable testing when building BUILD_4 --- .github/workflows/Linux.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Linux.yml b/.github/workflows/Linux.yml index 331bf461..e5e050ed 100644 --- a/.github/workflows/Linux.yml +++ b/.github/workflows/Linux.yml @@ -22,7 +22,7 @@ jobs: strategy: matrix: openmp: [ ON, OFF ] - options: [ -DBUILD_D=OFF, -DBUILD_4=OFF ] + options: [ -DBUILD_D=OFF, -DBUILD_4=OFF -DBUILD_TESTING=OFF ] steps: From e8335c56887d120aee005a637634d9581e3015d0 Mon Sep 17 00:00:00 2001 From: Alex Richert Date: Thu, 15 Jun 2023 10:50:23 -0700 Subject: [PATCH 3/4] correct matrix --- .github/workflows/Linux.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Linux.yml b/.github/workflows/Linux.yml index e5e050ed..7002b1ae 100644 --- a/.github/workflows/Linux.yml +++ b/.github/workflows/Linux.yml @@ -22,7 +22,7 @@ jobs: strategy: matrix: openmp: [ ON, OFF ] - options: [ -DBUILD_D=OFF, -DBUILD_4=OFF -DBUILD_TESTING=OFF ] + options: [ -DBUILD_D=OFF -DBUILD_TESTING=OFF, -DBUILD_4=OFF ] steps: From 3ba3e14ef7837a9f21ee75de8a49d30824d3d41b Mon Sep 17 00:00:00 2001 From: Alex Richert Date: Thu, 15 Jun 2023 11:59:42 -0700 Subject: [PATCH 4/4] Disable testing when only building _4 --- .github/workflows/Linux.yml | 2 +- CMakeLists.txt | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/Linux.yml b/.github/workflows/Linux.yml index 7002b1ae..331bf461 100644 --- a/.github/workflows/Linux.yml +++ b/.github/workflows/Linux.yml @@ -22,7 +22,7 @@ jobs: strategy: matrix: openmp: [ ON, OFF ] - options: [ -DBUILD_D=OFF -DBUILD_TESTING=OFF, -DBUILD_4=OFF ] + options: [ -DBUILD_D=OFF, -DBUILD_4=OFF ] steps: diff --git a/CMakeLists.txt b/CMakeLists.txt index 7336f19d..f15af2ad 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,6 +25,10 @@ if(BUILD_4 AND BUILD_D) set(kinds "4" "d") elseif(BUILD_4 AND NOT BUILD_D) set(kinds "4") + if(BUILD_TESTING) + set(BUILD_TESTING OFF) + message(WARNING "Disabling build testing for BUILD_4-only case") + endif() elseif(BUILD_D AND NOT BUILD_4) set(kinds "d") else()