Skip to content

Commit

Permalink
use presets
Browse files Browse the repository at this point in the history
  • Loading branch information
scivision committed Nov 13, 2024
1 parent 597c8b3 commit cf662b5
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 12 deletions.
3 changes: 0 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -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

Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/ci_bsd.yml.bak
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
name: bsd

env:
CTEST_NO_TESTS_ACTION: error

on:
push:
paths:
Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/ci_windows.yml
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/oneapi-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/oneapi-windows.yml.bak
Original file line number Diff line number Diff line change
Expand Up @@ -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++

Expand Down
5 changes: 5 additions & 0 deletions CMakePresets.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
},
{
Expand Down
5 changes: 5 additions & 0 deletions cmake/compilers.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit cf662b5

Please sign in to comment.