Skip to content

Commit 96dc6df

Browse files
committed
Incorp. feedback
1 parent 9afbdb8 commit 96dc6df

3 files changed

Lines changed: 6 additions & 4 deletions

File tree

.github/workflows/cmake.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
cmake-linux-ci-opts-
4646
- name: Compile
4747
run: |
48-
cmake --preset linux-ci-build-with-nonstandard-options -DQL_COMPILE_WARNING_AS_ERROR=ON -L
48+
cmake --preset linux-ci-build-with-nonstandard-options -L
4949
cmake --build --preset linux-ci-build-with-nonstandard-options --verbose
5050
- name: Test
5151
run: |
@@ -144,7 +144,7 @@ jobs:
144144
shell: cmd
145145
run: |
146146
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Vc\Auxiliary\Build\vcvarsall.bat" amd64 -vcvars_ver=14.3 || exit 1
147-
cmake --preset windows-ci-build-with-nonstandard-options -DQL_COMPILE_WARNING_AS_ERROR=ON -L
147+
cmake --preset windows-ci-build-with-nonstandard-options -L
148148
cmake --build --preset windows-ci-build-with-nonstandard-options --verbose
149149
- name: Test
150150
run: |

CMakePresets.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,8 @@
116116
"QL_HIGH_RESOLUTION_DATE": "ON",
117117
"QL_NULL_AS_FUNCTIONS": "ON",
118118
"QL_USE_INDEXED_COUPON": "ON",
119-
"QL_USE_STD_CLASSES": "ON"
119+
"QL_USE_STD_CLASSES": "ON",
120+
"QL_COMPILE_WARNING_AS_ERROR": "ON"
120121
}
121122
},
122123
{
@@ -137,6 +138,7 @@
137138
"QL_NULL_AS_FUNCTIONS": "ON",
138139
"QL_USE_INDEXED_COUPON": "ON",
139140
"QL_USE_STD_CLASSES": "ON",
141+
"QL_COMPILE_WARNING_AS_ERROR": "ON",
140142
"CMAKE_CXX_COMPILER_LAUNCHER": "sccache"
141143
},
142144
"vendor": {

cmake/Platform.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ if (MSVC)
3232
add_compile_options(/wd4267 /wd4819 /wd26812)
3333

3434
# prevent warnings when using /std:c++17 and above
35-
if(CMAKE_CXX_STANDARD GREATER 14)
35+
if(CMAKE_CXX_STANDARD GREATER_EQUAL 17)
3636
# E.g. caused by #include <boost/numeric/ublas/matrix.hpp>
3737
# In c++17 std::iterator is deprecated. As of boost 1.81 boost::ublas has not provided a fix for this.
3838
add_compile_definitions(_SILENCE_CXX17_ITERATOR_BASE_CLASS_DEPRECATION_WARNING)

0 commit comments

Comments
 (0)