File tree Expand file tree Collapse file tree 3 files changed +7
-1
lines changed Expand file tree Collapse file tree 3 files changed +7
-1
lines changed Original file line number Diff line number Diff line change @@ -157,6 +157,8 @@ jobs:
157
157
- name : Rust Test
158
158
if : inputs.rust == '1'
159
159
shell : bash
160
+ env :
161
+ OIIO_CXX_STANDARD : c++${{inputs.cxx_std}}
160
162
run : src/build-scripts/ci-rust-test.bash
161
163
- name : Code coverage
162
164
if : inputs.coverage == '1'
Original file line number Diff line number Diff line change 14
14
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH :$OpenImageIO_ROOT /lib
15
15
export PKG_CONFIG_PATH=$PKG_CONFIG_PATH :$OpenImageIO_ROOT /lib/pkgconfig
16
16
17
+ echo " Using C++ STD ${OIIO_CXX_STANDARD} "
18
+
17
19
echo " Running Rust oiio-sys tests"
18
20
19
21
pushd src/rust/oiio-sys
Original file line number Diff line number Diff line change @@ -19,9 +19,11 @@ fn main() -> Result<()> {
19
19
let pkgconfig = pkg_config:: probe_library ( "OpenImageIO" ) ?;
20
20
include_paths. extend ( pkgconfig. include_paths ) ;
21
21
22
+ let std_version = std:: env:: var ( "OIIO_CXX_STANDARD" ) . unwrap_or ( "c++17" . to_string ( ) ) ;
23
+
22
24
cxx_build:: bridges ( NAMES . iter ( ) . map ( |s| format ! ( "src/{}.rs" , s) ) )
23
25
. files ( NAMES . iter ( ) . map ( |s| format ! ( "src/{}.cpp" , s) ) )
24
- . std ( "c++17" )
26
+ . std ( & std_version )
25
27
. includes ( & include_paths)
26
28
. compile ( "oiio-sys" ) ;
27
29
You can’t perform that action at this time.
0 commit comments