Skip to content

Commit f77b92d

Browse files
committed
SConstruct : Update C++ version to C++17
Also remove explicit override in CI setup, so we inherit the version from the SConstruct.
1 parent ef51796 commit f77b92d

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

.github/workflows/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,11 +156,11 @@ jobs:
156156
157157
- name: Build
158158
run: |
159-
scons -j 2 install BUILD_TYPE=${{ matrix.buildType }} OPTIONS=${{ matrix.options }} CXXSTD=c++14 BUILD_CACHEDIR=sconsCache
159+
scons -j 2 install BUILD_TYPE=${{ matrix.buildType }} OPTIONS=${{ matrix.options }} BUILD_CACHEDIR=sconsCache
160160
161161
- name: Test
162162
run: |
163-
scons ${{ matrix.tests }} BUILD_TYPE=${{ matrix.buildType }} OPTIONS=${{ matrix.options }} CXXSTD=c++14 BUILD_CACHEDIR=sconsCache
163+
scons ${{ matrix.tests }} BUILD_TYPE=${{ matrix.buildType }} OPTIONS=${{ matrix.options }} BUILD_CACHEDIR=sconsCache
164164
env:
165165
IECORE_RTLD_GLOBAL: 0
166166

SConstruct

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ o.Add(
9393
o.Add(
9494
"CXXSTD",
9595
"The C++ standard to build against.",
96-
"c++11"
96+
"c++17"
9797
)
9898

9999
o.Add(

0 commit comments

Comments
 (0)