Skip to content

Commit 8e21530

Browse files
authored
CI: Remove GTEST check to set C++ standard (#879)
Fixes CI tests on Tigoa with CCE compilers and explicitly requesting C++14.
1 parent 6d28131 commit 8e21530

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

.github/workflows/ubuntu-latest-clang.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ jobs:
4141
-D CMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} \
4242
-D CMAKE_C_COMPILER="$(which clang)" \
4343
-D CMAKE_CXX_COMPILER="$(which clang++)" \
44+
-D CMAKE_CXX_STANDARD=17 \
4445
-D SUNDIALS_LOGGING_LEVEL=${{matrix.logging_level}} \
4546
-D ENABLE_ALL_WARNINGS=ON \
4647
-D ENABLE_WARNINGS_AS_ERRORS=ON \

cmake/SundialsSetupCXX.cmake

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,7 @@ sundials_option(CMAKE_CXX_STANDARD_REQUIRED BOOL "Require C++ standard version"
3333

3434
if(SUNDIALS_ENABLE_PYTHON
3535
OR SUNDIALS_ENABLE_SYCL
36-
OR SUNDIALS_ENABLE_GINKGO
37-
OR SUNDIALS_TEST_ENABLE_GTEST)
36+
OR SUNDIALS_ENABLE_GINKGO)
3837
set(DOCSTR "The C++ standard to use if C++ is enabled (17, 20, 23)")
3938
sundials_option(CMAKE_CXX_STANDARD STRING "${DOCSTR}" "17" OPTIONS "17;20;23")
4039
else()

0 commit comments

Comments
 (0)