Skip to content

Commit

Permalink
Merge pull request #153 from johnhaddon/c++14
Browse files Browse the repository at this point in the history
Build with C++14
  • Loading branch information
tomc-cinesite authored Jun 8, 2020
2 parents f77041e + efcc69c commit 5540945
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Boost/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"commands" : [

"./bootstrap.sh --prefix={buildDir} --with-python={buildDir}/bin/python --with-python-root={buildDir} --without-libraries=log --without-icu",
"./bjam -d+2 -j {jobs} --disable-icu cxxflags='-std=c++11' variant=release link=shared threading=multi install",
"./bjam -d+2 -j {jobs} --disable-icu cxxflags='-std={c++Standard}' variant=release link=shared threading=multi install",

],

Expand Down
1 change: 1 addition & 0 deletions Changes
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ This major version introduces the concept of build variants, and provides packag
- Cortex : Updated to version 10.0.0-a78.
- USD : Updated to version 20.05.
- LibRaw : Added version 0.19.5.
- Build : Switched standard to C++14.

1.2.0
-----
Expand Down
1 change: 1 addition & 0 deletions Cortex/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
"scons install installDoc"
" -j {jobs}"
" CXX=`which g++`"
" CXXSTD={c++Standard}"
" INSTALL_PREFIX={buildDir}"
" INSTALL_DOC_DIR={buildDir}/doc/cortex"
" INSTALL_RMANPROCEDURAL_NAME={buildDir}/renderMan/procedurals/iePython"
Expand Down
2 changes: 1 addition & 1 deletion TBB/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

"commands" : [

"make -j {jobs} stdver=c++11",
"make -j {jobs} stdver={c++Standard}",
"cp -r include/tbb {buildDir}/include",
"{installLibsCommand}",

Expand Down
1 change: 1 addition & 0 deletions build.py
Original file line number Diff line number Diff line change
Expand Up @@ -453,6 +453,7 @@ def walk( project, configs, buildDir ) :
"version" : __version,
"platform" : "osx" if sys.platform == "darwin" else "linux",
"sharedLibraryExtension" : ".dylib" if sys.platform == "darwin" else ".so",
"c++Standard" : "c++14",
"variants" : "".join( "-{}{}".format( key, variants[key] ) for key in sorted( variants.keys() ) ),
}

Expand Down

0 comments on commit 5540945

Please sign in to comment.