From cf662b56cc297a3dfaa1a960a8fda404ed6e5d6b Mon Sep 17 00:00:00 2001 From: scivision Date: Wed, 13 Nov 2024 11:03:24 -0500 Subject: [PATCH] use presets --- .github/workflows/ci.yml | 3 --- .github/workflows/ci_bsd.yml.bak | 3 --- .github/workflows/ci_windows.yml | 3 --- .github/workflows/oneapi-linux.yml | 2 -- .github/workflows/oneapi-windows.yml.bak | 1 - CMakePresets.json | 5 +++++ cmake/compilers.cmake | 5 +++++ 7 files changed, 10 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dd136c76..d3467169 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,10 +1,7 @@ name: ci env: - CMAKE_TLS_VERIFY: true HOMEBREW_NO_INSTALL_CLEANUP: 1 - CTEST_NO_TESTS_ACTION: error - CTEST_PARALLEL_LEVEL: 0 CMAKE_INSTALL_PREFIX: ~/libs CMAKE_PREFIX_PATH: ~/libs diff --git a/.github/workflows/ci_bsd.yml.bak b/.github/workflows/ci_bsd.yml.bak index eb0c83c0..4e976484 100644 --- a/.github/workflows/ci_bsd.yml.bak +++ b/.github/workflows/ci_bsd.yml.bak @@ -1,8 +1,5 @@ name: bsd -env: - CTEST_NO_TESTS_ACTION: error - on: push: paths: diff --git a/.github/workflows/ci_windows.yml b/.github/workflows/ci_windows.yml index 1e14005a..7af041bd 100644 --- a/.github/workflows/ci_windows.yml +++ b/.github/workflows/ci_windows.yml @@ -1,10 +1,7 @@ name: ci_windows env: - CTEST_NO_TESTS_ACTION: error - CTEST_PARALLEL_LEVEL: 0 CMAKE_BUILD_PARALLEL_LEVEL: 4 - CMAKE_TLS_VERIFY: true CMAKE_INSTALL_PREFIX: libs CMAKE_PREFIX_PATH: libs diff --git a/.github/workflows/oneapi-linux.yml b/.github/workflows/oneapi-linux.yml index 6c72bd21..7810f03f 100644 --- a/.github/workflows/oneapi-linux.yml +++ b/.github/workflows/oneapi-linux.yml @@ -5,9 +5,7 @@ env: CXX: icpx FC: ifx # https://github.com/oneapi-src/oneapi-ci/blob/master/.github/workflows/build_all.yml - CTEST_NO_TESTS_ACTION: error CMAKE_BUILD_PARALLEL_LEVEL: 4 - CTEST_PARALLEL_LEVEL: 0 CMAKE_BUILD_TYPE: Release # debug triggers asan build errors in general with oneAPI Linux CMAKE_INSTALL_PREFIX: ~/libs diff --git a/.github/workflows/oneapi-windows.yml.bak b/.github/workflows/oneapi-windows.yml.bak index cff08946..061423e5 100644 --- a/.github/workflows/oneapi-windows.yml.bak +++ b/.github/workflows/oneapi-windows.yml.bak @@ -12,7 +12,6 @@ env: CC: icx CXX: icx FC: ifx - CTEST_NO_TESTS_ACTION: error CMAKE_BUILD_TYPE: Release # Release is necessary to avoid ITERATOR_DEBUG_LEVEL mismatch with libstdc++ diff --git a/CMakePresets.json b/CMakePresets.json index d371c9cc..7eaab08a 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -7,7 +7,12 @@ "binaryDir": "${sourceDir}/build", "cacheVariables": { "CMAKE_COMPILE_WARNING_AS_ERROR": true, + "CMAKE_LINK_WARNING_AS_ERROR": true, "ffilesystem_fallback": false + }, + "environment": { + "CTEST_NO_TESTS_ACTION": "error", + "CTEST_PARALLEL_LEVEL": "0" } }, { diff --git a/cmake/compilers.cmake b/cmake/compilers.cmake index c32e478e..36c1c813 100644 --- a/cmake/compilers.cmake +++ b/cmake/compilers.cmake @@ -44,6 +44,11 @@ if(GNU_stdfs) message(STATUS "adding C++ library flags ${GNU_stdfs}") endif() +message(VERBOSE "CMAKE_CXX_COMPILER_LINKER_ID: ${CMAKE_CXX_COMPILER_LINKER_ID} +CMAKE_CXX_COMPILER_LINKER_ID: ${CMAKE_CXX_COMPILER_LINKER_ID} +CMAKE_Fortran_COMPILER_LINKER_ID: ${CMAKE_Fortran_COMPILER_LINKER_ID} +") + # --- compiler standard setting -- need if(NOT) in case CMAKE_CXX_STANDARD is set but blank. if(NOT CMAKE_CXX_STANDARD OR CMAKE_CXX_STANDARD LESS 17) set(CMAKE_CXX_STANDARD 17)