OIIO/OSL : Specify C++ version

CMake's convention is to omit the "c++" prefix and just use the number, so we also need to adjust the format of our variable.
johnhaddon · Feb 15, 2021 · 9474f57 · 9474f57
1 parent a08d386
commit 9474f57
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 4 deletions.
diff --git a/Boost/config.py b/Boost/config.py
@@ -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++Standard}' variant=release link=shared threading=multi install",
+		"./bjam -d+2 -j {jobs} --disable-icu cxxflags='-std=c++{c++Standard}' variant=release link=shared threading=multi install",
 
 	],
 

diff --git a/Cortex/config.py b/Cortex/config.py
@@ -28,7 +28,7 @@
 		"scons install installDoc"
 			" -j {jobs}"
 			" CXX=`which g++`"
-			" CXXSTD={c++Standard}"
+			" CXXSTD=c++{c++Standard}"
 			" INSTALL_PREFIX={buildDir}"
 			" INSTALL_DOC_DIR={buildDir}/doc/cortex"
 			" INSTALL_RMANPROCEDURAL_NAME={buildDir}/renderMan/procedurals/iePython"

diff --git a/OpenImageIO/config.py b/OpenImageIO/config.py
@@ -17,6 +17,7 @@
 		"mkdir gafferBuild",
 		"cd gafferBuild &&"
 			" cmake"
+			" -D CMAKE_CXX_STANDARD={c++Standard}"
 			" -D CMAKE_INSTALL_PREFIX={buildDir}"
 			" -D CMAKE_INSTALL_LIBDIR={buildDir}/lib"
 			" -D CMAKE_PREFIX_PATH={buildDir}"

diff --git a/OpenShadingLanguage/config.py b/OpenShadingLanguage/config.py
@@ -26,6 +26,7 @@
 		"mkdir gafferBuild",
 		"cd gafferBuild &&"
 			" cmake"
+			" -D CMAKE_CXX_STANDARD={c++Standard}"
 			" -D CMAKE_INSTALL_PREFIX={buildDir}"
 			" -D CMAKE_INSTALL_LIBDIR={buildDir}/lib"
 			" -D CMAKE_PREFIX_PATH={buildDir}"

diff --git a/TBB/config.py b/TBB/config.py
@@ -12,7 +12,7 @@
 
 	"commands" : [
 
-		"make -j {jobs} stdver={c++Standard}",
+		"make -j {jobs} stdver=c++{c++Standard}",
 		"cp -r include/tbb {buildDir}/include",
 		"{installLibsCommand}",
 

diff --git a/build.py b/build.py
@@ -463,7 +463,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",
+	"c++Standard" : "14",
 	"variants" : "".join( "-{}{}".format( key, variants[key] ) for key in sorted( variants.keys() ) ),
 }