Merge pull request #1434 from ericmehl/visualStudio2022

Update to Dependencies 9.1.0

Author: johnhaddon

.github/workflows/main.yml

@@ -44,7 +44,7 @@ jobs:
             buildType: RELEASE
             containerImage: ghcr.io/gafferhq/build/build:3.0.0
             options: .github/workflows/main/options.posix
-            dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/8.0.1/gafferDependencies-8.0.1-linux-gcc11.tar.gz
+            dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/9.1.0/gafferDependencies-9.1.0-linux-gcc11.tar.gz
             tests: testCore testCorePython testScene testImage testAlembic testUSD testVDB
             publish: true
             jobs: 4
@@ -54,25 +54,25 @@ jobs:
             buildType: DEBUG
             containerImage: ghcr.io/gafferhq/build/build:3.0.0
             options: .github/workflows/main/options.posix
-            dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/8.0.1/gafferDependencies-8.0.1-linux-gcc11.tar.gz
+            dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/9.1.0/gafferDependencies-9.1.0-linux-gcc11.tar.gz
             tests: testCore testCorePython testScene testImage testAlembic testUSD testVDB
             publish: false
             jobs: 4
 
           - name: windows
-            os: windows-2019
+            os: windows-2022
             buildType: RELEASE
             options: .github/workflows/main/options.windows
-            dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/8.0.1/gafferDependencies-8.0.1-windows.zip
+            dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/9.1.0/gafferDependencies-9.1.0-windows.zip
             tests: testCore testCorePython testScene testImage testAlembic testUSD testVDB
             publish: true
             jobs: 4
 
           - name: windows-debug
-            os: windows-2019
+            os: windows-2022
             buildType: RELWITHDEBINFO
             options: .github/workflows/main/options.windows
-            dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/8.0.1/gafferDependencies-8.0.1-windows.zip
+            dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/9.1.0/gafferDependencies-9.1.0-windows.zip
             tests: testCore testCorePython testScene testImage testAlembic testUSD testVDB
             publish: false
             jobs: 4
@@ -81,7 +81,7 @@ jobs:
             os: macos-14
             buildType: RELEASE
             options: .github/workflows/main/options.posix
-            dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/9.0.0/gafferDependencies-9.0.0-macos-arm64.tar.gz
+            dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/9.1.0/gafferDependencies-9.1.0-macos-arm64.tar.gz
             tests: testCore testCorePython testScene testImage testAlembic testUSD testVDB
             publish: true
             jobs: 3

.github/workflows/main/options.windows

@@ -2,7 +2,7 @@ import os
 
 deps = os.environ.get( "CORTEX_BUILD_NAME" )
 includes = os.path.join( deps, "include" )
-libs = os.path.join( deps, "lib" )
+libs = os.path.join( deps, "lib" ) + os.pathsep + os.path.join( deps, "bin" )
 
 build = os.environ.get( "CORTEX_BUILD_NAME" )
 

Changes

@@ -54,6 +54,8 @@ Build
 - CI :
   - IECoreHoudini tests updated to pass on newer environments.
   - IECoreGL tests updated with relaxed precisions for image comparisons.
+  - Updated to GafferHQ/dependencies 9.0.0.
+  - Updated Windows build to use MSVC 2022.
 
 10.5.10.0 (relative to 10.5.9.5)
 =========

SConstruct

@@ -985,7 +985,7 @@ o.Add(
 ###########################################################################################
 
 env = Environment(
-	MSVC_VERSION = "14.2",
+	MSVC_VERSION = "14.3",
 	options = o
 )