Merge pull request #1281 from ericmehl/windows-dependencies-6.0.0

Update for Windows dependencies 6.0.0

Author: johnhaddon

.github/workflows/main.yml

@@ -75,6 +75,22 @@ jobs:
             tests: testCore testCorePython testScene testImage testAlembic testUSD testVDB
             publish: true
 
+          - name: windows-python3
+            os: windows-2019
+            buildType: RELEASE
+            options: .github/workflows/main/options.windows
+            dependenciesURL: https://github.com/hypothetical-inc/gafferDependencies/releases/download/6.0.0/gafferDependencies-6.0.0-Python3-windows.zip
+            tests: testCore testCorePython testScene testImage testAlembic testUSD testVDB
+            publish: false
+
+          - name: windows-python3-debug
+            os: windows-2019
+            buildType: RELWITHDEBINFO
+            options: .github/workflows/main/options.windows
+            dependenciesURL: https://github.com/hypothetical-inc/gafferDependencies/releases/download/6.0.0/gafferDependencies-6.0.0-Python3-windows.zip
+            tests: testCore testCorePython testScene testImage testAlembic testUSD testVDB
+            publish: false
+
     runs-on: ${{ matrix.os }}
 
     container: ${{ matrix.containerImage }}
@@ -166,6 +182,7 @@ jobs:
         scons ${{ matrix.tests }} BUILD_TYPE=${{ matrix.buildType }} OPTIONS=${{ matrix.options }} BUILD_CACHEDIR=sconsCache
       env:
         IECORE_RTLD_GLOBAL: 0
+        OCIO: ${{ env.CORTEX_BUILD_NAME }}/openColorIO/config.ocio
 
     - name: Build Package
       run: |

.github/workflows/main/options.windows

@@ -13,14 +13,6 @@ INSTALL_RMANDISPLAY_NAME = build + "\\renderMan\\displayDrivers\\ieDisplay"
 INSTALL_PYTHON_DIR = build + "\\python"
 INSTALL_IECORE_OPS = ""
 
-# disable permissive mode, making MSVC more standards compliant
-# /D_USE_MATH_DEFINES is needed with permissive mode off for
-# common definitions like M_P
-# /Zc:externC- fixes a compilation error with Boost::interprocess
-# described here:
-# https://developercommunity.visualstudio.com/content/problem/756694/including-windowsh-and-boostinterprocess-headers-l.html
-CXXFLAGS = ["/permissive-", "/D_USE_MATH_DEFINES", "/Zc:externC-"]
-
 LIBPATH = libs
 
 PYTHON = deps + "\\bin\\python"
@@ -33,8 +25,9 @@ PYTHONPATH = deps + "\\python"
 # Libs
 # ====
 
-BOOST_INCLUDE_PATH = includes + "\\boost-1_68"
-BOOST_LIB_SUFFIX = "-vc141-mt-x64-1_68"
+BOOST_INCLUDE_PATH = includes
+BOOST_LIB_SUFFIX = ""
+BOOST_LIB_PATH = libs
 
 OPENEXR_INCLUDE_PATH = includes
 OIIO_INCLUDE_PATH = includes + "\\OpenImageIO"
@@ -53,6 +46,7 @@ GLEW_LIB_SUFFIX = "32"
 TBB_INCLUDE_PATH = includes
 USD_INCLUDE_PATH = includes
 USD_LIB_PATH = libs
+USD_LIB_PREFIX = "usd_"
 DOXYGEN = deps + "\\doxygen\\doxygen.exe"
 
 # Renderers
@@ -76,5 +70,5 @@ WARNINGS_AS_ERRORS = "1"
 
 # PATH is needed to locate the MSVC compiler. PROCESSOR_ARCHITECTURE and USERNAME
 # are needed by the HeaderGenerator and accompanying tests.
-ENV_VARS_TO_IMPORT = "PATH PROCESSOR_ARCHITECTURE USERNAME CI"
+ENV_VARS_TO_IMPORT = "PATH PROCESSOR_ARCHITECTURE USERNAME CI OCIO"
 

.gitignore

@@ -7,6 +7,13 @@
 *.pyc
 *.dylib
 *.code-workspace
+*.obj
+*.pyd
+*.pdb
+*.dll
+*.lib
+*.ilk
+*.exp
 .sconsign.dblite
 .sconf_temp
 .cproject

SConstruct

@@ -85,10 +85,18 @@ o.Add(
 
 )
 
+# Windows : Disable permissive mode, making MSVC more standards compliant.
+# /D_USE_MATH_DEFINES is needed with permissive mode off for
+# common definitions like M_P.
+# /Zc:externC- fixes a compilation error with Boost::interprocess
+# described here:
+# https://developercommunity.visualstudio.com/content/problem/756694/including-windowsh-and-boostinterprocess-headers-l.html
+# /DBOOST_ALL_NO_LIB is needed to find Boost when it is built without
+# verbose system information added to file and directory names.
 o.Add(
 	"CXXFLAGS",
 	"The extra flags to pass to the C++ compiler during compilation.",
-	[ "-pipe", "-Wall", "-Wextra" ] if Environment()["PLATFORM"] != "win32" else [],
+	[ "-pipe", "-Wall", "-Wextra" ] if Environment()["PLATFORM"] != "win32" else [ "/permissive-", "/D_USE_MATH_DEFINES", "/Zc:externC-", "/DBOOST_ALL_NO_LIB" ],
 )
 
 o.Add(
@@ -1171,7 +1179,6 @@ else:
 			"/D_WINDLL",
 			"/D_MBCS",
 			"/W4",
-			"/experimental:external",
 			"/external:W0",
 			"/Zc:inline", # Remove unreferenced function or data if it is COMDAT or has internal linkage only
 			"/GR", # enable RTTI
@@ -1196,6 +1203,13 @@ else:
 				"/wd4244",  # suppress warning about possible loss of data in type conversion
 				"/wd4305",  # suppress warning about conversion from double to float
 				"/wd4506",  # suppress warning about no definition for inline function. Needed for USD::Glf
+				# NOTE : the following warnings are generated by external dependencies, even when using /external
+				# They may be able to be re-enabled after updating to MSVC 2022.
+				"/wd4127",  # suppress warning "conditional expression is constant", Needed for USD
+				"/wd4456",  # suppress warning "declaration of 'x' hides previous local declaration"
+				"/wd4459",  # suppress warning "declaration of 'x' hides global declaration"
+				"/wd4201",  # suppress warning "nonstandard extension used : nameless struct/union"
+				"/wd4245",  # suppress warning "'initializing': conversion from 'int' to 'size_t', signed / unsigned mismatch
 				# suppress warning about exported class deriving from non-exported class.
 				# Microsoft states (in https://docs.microsoft.com/en-us/cpp/error-messages/compiler-warnings/compiler-warning-level-2-c4275?view=msvc-170)
 				# that "C4275 can be ignored if you are deriving from a type in the
@@ -2166,6 +2180,7 @@ if env["WITH_GL"] and doConfigure :
 			# while still using -Werror.
 			"-Wno-format" if env["PLATFORM"] != "win32" else "",
 			"-Wno-strict-aliasing" if env["PLATFORM"] != "win32" else "",
+			"/wd4701" if env["PLATFORM"] == "win32" else "",
 			systemIncludeArgument, "$GLEW_INCLUDE_PATH",
 			systemIncludeArgument, "$OIIO_INCLUDE_PATH",
 		],
@@ -3031,6 +3046,7 @@ if usdEnv["USD_LIB_PREFIX"] :
 usdEnvAppends = {
 	"CXXFLAGS" : [
 		"-Wno-deprecated" if env["PLATFORM"] != "win32" else "",
+		"/Zc:inline-" if env["PLATFORM"] == "win32" else "",
 		"-DIECoreUSD_EXPORTS",
 		systemIncludeArgument, "$USD_INCLUDE_PATH",
 		systemIncludeArgument, "$PYTHON_INCLUDE_PATH",