Merge pull request #11 from ericmehl/msvc2017_v4

Update to GafferHQ dependencies 2.1.0 with Windows build configurations added.

.gitignore

@@ -1,2 +1,7 @@
 working
 */archives
+**/gafferBuild
+llvm*/build-release
+qt*/**/*.qm
+c-blosc*/**
+qt-adsk-*/**

Alembic/config.py

@@ -37,19 +37,56 @@
 
 	"manifest" : [
 
-		"bin/abcconvert",
-		"bin/abcecho",
-		"bin/abcechobounds",
-		"bin/abcls",
-		"bin/abcstitcher",
-		"bin/abctree",
+		"bin/abcconvert{executableExtension}",
+		"bin/abcecho{executableExtension}",
+		"bin/abcechobounds{executableExtension}",
+		"bin/abcls{executableExtension}",
+		"bin/abcstitcher{executableExtension}",
+		"bin/abctree{executableExtension}",
 
 		"include/Alembic",
 
-		"lib/libAlembic*",
+		"lib/{libraryPrefix}Alembic*",
+		"lib/{libraryPrefix}Alembic*.lib",
 
 		"python/alembic*",
 
 	],
 
+	"platform:windows" : {
+
+		"commands" : [
+
+			"cmake"
+				" -G {cmakeGenerator}"
+				" -D CMAKE_BUILD_TYPE={cmakeBuildType}"
+				" -D CMAKE_INSTALL_PREFIX={buildDir}"
+				" -D CMAKE_PREFIX_PATH={buildDir}"
+				" -D ALEMBIC_NO_TESTS=ON"
+				" -D ALEMBIC_NO_OPENGL=ON"
+				" -D Boost_NO_SYSTEM_PATHS=ON"
+				" -D Boost_NO_BOOST_CMAKE=ON"
+				" -D BOOST_ROOT={buildDir}"
+				" -D HDF5_ROOT={buildDir}"
+				" -D ILMBASE_ROOT={buildDir}"
+				" -D USE_TESTS=OFF"
+				" -D USE_HDF5=ON"
+				" -D USE_PYILMBASE=OFF"
+				" -D USE_PYALEMBIC=OFF"
+				" -D USE_ARNOLD=OFF"
+				" -D USE_PRMAN=OFF"
+				" -D USE_MAYA=OFF"
+				" -D ALEMBIC_LIB_USES_BOOST=TRUE"
+				" -D ALEMBIC_ILMBASE_HALF_LIB={buildDir}\\lib\\half.lib"
+				" -D ALEMBIC_ILMBASE_IEX_LIB={buildDir}\\lib\\Iex.lib"
+				" -D ALEMBIC_ILMBASE_IEXMATH_LIB={buildDir}\\lib\\IexMath.lib"
+				" -D ALEMBIC_ILMBASE_ILMTHREAD_LIB={buildDir}\\lib\\IlmThread.lib"
+				" -D ALEMBIC_ILMBASE_IMATH_LIB={buildDir}\\lib\\Imath.lib"
+				" .",
+			"cmake --build . --config {cmakeBuildType} --target install"
+
+		],
+
+	},
+
 }

Appleseed/config.py

@@ -2,7 +2,7 @@
 
 	"downloads" : [
 
-		"https://github.com/appleseedhq/appleseed/archive/2.1.0-beta.tar.gz"
+		"https://github.com/appleseedhq/appleseed/archive/2.0.5-beta.tar.gz"
 
 	],
 
@@ -55,7 +55,7 @@
 			" -D CMAKE_INSTALL_PREFIX={buildDir}/appleseed"
 			" -D CMAKE_LIBRARY_PATH={pythonLibDir}"
 			" ..",
-
+			
 		"cd build && make install -j {jobs} VERBOSE=1"
 
 	],
@@ -103,5 +103,70 @@
 		"appleseed/shaders",
 
 	],
+	"platform:windows" : {
+
+		"variables" : {
+			"cmakeGenerator" : "\"Visual Studio 15 2017 Win64\"",
+		},
+
+		"environment" : {
+
+			"PATH" : "%PATH%;{buildDir}\\lib;{buildDir}\\bin",
+
+		},
+
+		"commands" : [
+			"if not exist \"build\" mkdir build",
+			"cd build &&"
+				" cmake"
+				" -G {cmakeGenerator}"
+				" -D CMAKE_VERBOSE_MAKEFILE:BOOL=ON"
+				" -D CMAKE_BUILD_TYPE={cmakeBuildType}"
+				" -D PYTHON_LIBRARY={pythonLibDir}\\python{pythonMajorVersion}{pythonMinorVersion}.lib"
+				" -D PYTHON_INCLUDE_DIR={pythonIncludeDir}"
+				" -D WITH_OSL=ON"
+				" -D WITH_CLI=ON"
+				" -D WITH_STUDIO=OFF"
+				" -D WITH_TOOLS=OFF"
+				" -D WITH_PYTHON=ON"
+				" -D WITH_PYTHON2_BINDINGS=ON"
+				" -D WITH_PYTHON3_BINDINGS=OFF"
+				" -D PYTHON_MAJOR_VERSION=2"
+				" -D WITH_OSL=ON"
+				" -D WITH_TESTS=OFF"
+				" -D USE_STATIC_BOOST=OFF"
+				" -D USE_STATIC_OIIO=OFF"
+				" -D USE_STATIC_EXR=OFF"
+				" -D USE_STATIC_OSL=OFF"
+				" -D USE_EXTERNAL_ZLIB=ON"
+				" -D USE_EXTERNAL_EXR=ON"
+				" -D USE_EXTERNAL_PNG=ON"
+				" -D USE_EXTERNAL_XERCES=ON"
+				" -D USE_EXTERNAL_OSL=ON"
+				" -D USE_EXTERNAL_OIIO=ON"
+				" -D USE_EXTERNAL_ALEMBIC=ON"
+				" -D WARNINGS_AS_ERRORS=OFF"
+				" -D USE_SSE=ON"
+				" -D CMAKE_PREFIX_PATH={buildDir}"
+				" -D CMAKE_INSTALL_PREFIX={buildDir}\\appleseed"
+				" -D BOOST_ROOT={buildDir}"
+				" -D IMATH_INCLUDE_DIRS={buildDir}\\include"
+				" -D IMATH_HALF_LIBRARY={buildDir}\\lib\\Half.lib"
+				" -D IMATH_IEX_LIBRARY={buildDir}\\lib\\Iex.lib"
+				" -D IMATH_MATH_LIBRARY={buildDir}\\lib\\Imath.lib"
+				" -D OPENEXR_INCLUDE_DIRS={buildDir}\\include"
+				" -D OPENEXR_IMF_LIBRARY={buildDir}\\lib\\IlmImf.lib"
+				" -D OPENEXR_THREADS_LIBRARY={buildDir}\\lib\\IlmThread.lib"
+				" -D XERCES_LIBRARY={buildDir}\\lib\\xerces-c_3.lib"
+				" -D OSL_INCLUDE_DIR={buildDir}\\include"
+				" -D LLVM_LIBS_DIR={buildDir}\\lib"
+				" OSL_EXEC_LIBRARY={buildDir}\\lib\\oslexec.lib"
+				" OSL_COMP_LIBRARY={buildDir}\\lib\\oslcomp.lib"
+				" OSL_QUERY_LIBRARY={buildDir}\\lib\\oslquery.lib"
+				" ..",
+			"cd build && cmake --build . --config {cmakeBuildType} --target install",
+		]
+
+	}
 
 }

Appleseed/patches/windows/0001-remove_boost_namespace.patch

@@ -0,0 +1,10 @@
+--- a/src/appleseed/renderer/meta/tests/test_tracer.cpp	2020-05-14 18:34:13.413540600 -0400
++++ b/src/appleseed/renderer/meta/tests/test_tracer.cpp	2020-05-14 18:32:10.040808300 -0400
+@@ -83,7 +83,6 @@
+
+ using namespace foundation;
+ using namespace renderer;
+-using namespace boost;
+ using namespace std;
+
+ TEST_SUITE(Renderer_Kernel_Lighting_Tracer)

Appleseed/patches/windows/0002-win-vs.patch

@@ -0,0 +1,16 @@
+--- a/cmake/config/win-vs.txt	2020-05-14 19:22:32.135735200 -0400
++++ b/cmake/config/win-vs.txt	2020-05-14 19:24:49.460860100 -0400
+@@ -312,10 +312,10 @@
+
+ macro (link_against_osl target)
+     set (LLVM_LIBS
+-        LLVMLTO LLVMLinker LLVMipo LLVMVectorize LLVMBitWriter LLVMTableGen LLVMDebugInfo LLVMOption LLVMX86Disassembler LLVMX86AsmParser
++        LLVMLTO LLVMLinker LLVMipo LLVMVectorize LLVMBitWriter LLVMTableGen LLVMOption LLVMX86Disassembler LLVMX86AsmParser
+         LLVMX86CodeGen LLVMSelectionDAG LLVMAsmPrinter LLVMX86Desc LLVMX86Info LLVMX86AsmPrinter LLVMX86Utils LLVMIRReader LLVMBitReader
+-        LLVMAsmParser LLVMMCDisassembler LLVMMCParser LLVMInstrumentation LLVMInterpreter LLVMMCJIT LLVMJIT LLVMCodeGen LLVMObjCARCOpts
+-        LLVMScalarOpts LLVMInstCombine LLVMTransformUtils LLVMipa LLVMAnalysis LLVMRuntimeDyld LLVMExecutionEngine LLVMTarget LLVMMC
++        LLVMAsmParser LLVMMCDisassembler LLVMMCParser LLVMInstrumentation LLVMInterpreter LLVMMCJIT LLVMCodeGen LLVMObjCARCOpts
++        LLVMScalarOpts LLVMInstCombine LLVMTransformUtils LLVMAnalysis LLVMRuntimeDyld LLVMExecutionEngine LLVMTarget LLVMMC
+         LLVMObject LLVMCore LLVMSupport
+     )
+

BitstreamVera/config.py

@@ -21,5 +21,15 @@
 		"fonts",
 
 	],
+	"platform:windows" : {
+
+		"commands" : [
+
+			"if not exist \"{buildDir}\\fonts\" mkdir {buildDir}\\fonts",
+			"copy *.ttf {buildDir}\\fonts"
+
+		]
+
+	}
 
 }

Blosc/config.py

@@ -22,8 +22,30 @@
 	"manifest" : [
 
 		"include/blosc*.h",
-		"lib/libblosc*{sharedLibraryExtension}*",
+		"lib/{libraryPrefix}blosc*{sharedLibraryExtension}*",
+		"lib/{libraryPrefix}blosc*.lib",
 
 	],
+	"platform:windows" : {
+
+		"commands" : [
+
+			"mkdir gafferBuild",
+			"cd gafferBuild && "
+				" cmake"
+				" -Wno-dev"
+				" -G {cmakeGenerator}"
+				" -D CMAKE_BUILD_TYPE={cmakeBuildType}"
+				" -D CMAKE_INSTALL_PREFIX={buildDir}"
+				" -D BUILD_TESTS=OFF"
+				" -D BUILD_BENCHMARKS=OFF"
+				" -D BUILD_STATIC=OFF"
+				" ..",
+
+			"cd gafferBuild && cmake --build . --config {cmakeBuildType} --target install -- -j {jobs}",
+
+		],
+
+	},
 
 }

Boost/config.py

@@ -12,6 +12,12 @@
 
 	"dependencies" : [ "Python" ],
 
+	"variables" : {
+
+		"boostVersionSuffix" : "",
+
+	},
+
 	"environment" : {
 
 		# Without this, boost build will still pick up the system python framework,
@@ -28,16 +34,44 @@
 	"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",
 
 	],
 
 	"manifest" : [
 
-		"include/boost",
-		"lib/libboost_*{sharedLibraryExtension}*",
-		"lib/libboost_test_exec_monitor.a",
+		"include/boost{boostVersionSuffix}",
+		"lib/{libraryPrefix}boost_*{sharedLibraryExtension}*",
+		"lib/{libraryPrefix}boost_*.lib",
+		"lib/{libraryPrefix}boost_test_exec_monitor{staticLibraryExtension}",
 
 	],
 
+	"platform:windows" : {
+
+		"dependencies" : [ "Python", "Zlib" ],
+
+		"variables" : {
+
+			"boostVersionSuffix" : "-1_68",
+
+		},
+
+		"environment" : {
+
+			# Boost needs help finding Python
+			"PATH" : "%PATH%;{buildDir}\\bin",
+			"PYTHONPATH" : "{buildDir};{buildDir}\\bin;{buildDir}\\lib64;{buildDir}\\lib"
+
+		},
+
+		"commands" : [
+
+			"bootstrap.bat --prefix={buildDir} --with-python=\"{buildDir}\" --with-python-root=\"{buildDir}\" --without-libraries=log",
+			# "(echo using python ^: 2.7 : {buildDirFwd} ^: {buildDirFwd}/include ^: {buildDirFwd}/lib ^: ^<address-model^>64 ^;) >> project-config.jam",
+			"b2 -d+2 --prefix={buildDir} --toolset=msvc architecture=x86 address-model=64 --build-type=complete variant=release link=shared threading=multi -s ZLIB_SOURCE=%ROOT_DIR%\\Zlib\\working\\zlib-1.2.11 -s ZLIB_INCLUDE={buildDir}\\include -s ZLIB_LIBPATH={buildDir}\\lib -s ZLIB_BINARY=zlib install"
+
+		],
+
+	},
 }

Boost/patches/windows/0000-fix_permissive.patch

@@ -0,0 +1,56 @@
+From 0d0cd711a764a3b32d2cd19a1049eb9f36b4fd06 Mon Sep 17 00:00:00 2001
+From: Owens <[email protected]>
+Date: Fri, 17 Aug 2018 06:06:03 +1000
+Subject: [PATCH] Enable forward declaration of unwind_type() in msvc14.15 and
+ later.
+
+Name lookup in msvc has changed between 14.14 and 14.15 making it consistent with other compilers. Forward declaration of unwind_type() is now required as it is for other compilers.
+
+Resolves compilation errors identified in:
+
+https://github.com/boostorg/python/issues/228
+---
+ include/boost/python/detail/unwind_type.hpp | 12 +++++++-----
+ 1 file changed, 7 insertions(+), 5 deletions(-)
+
+diff --git a/include/boost/python/detail/unwind_type.hpp b/include/boost/python/detail/unwind_type.hpp
+index f6cdab64f..b81bf7c89 100644
+--- a/boost/python/detail/unwind_type.hpp
++++ b/boost/python/detail/unwind_type.hpp
+@@ -11,13 +11,15 @@
+
+ namespace boost { namespace python { namespace detail {
+
+-#ifndef _MSC_VER //if forward declared, msvc6.5 does not recognize them as inline
+-// forward declaration, required (at least) by Tru64 cxx V6.5-042
++#if (!defined(_MSC_VER) || _MSC_VER >= 1915)
++// If forward declared, msvc6.5 does not recognize them as inline.
++// However, as of msvc14.15 (_MSC_VER 1915/Visual Studio 15.8.0) name lookup is now consistent with other compilers.
++// forward declaration, required (at least) by Tru64 cxx V6.5-042 and msvc14.15
+ template <class Generator, class U>
+ inline typename Generator::result_type
+ unwind_type(U const& p, Generator* = 0);
+
+-// forward declaration, required (at least) by Tru64 cxx V6.5-042
++// forward declaration, required (at least) by Tru64 cxx V6.5-042 and msvc14.15
+ template <class Generator, class U>
+ inline typename Generator::result_type
+ unwind_type(boost::type<U>*p = 0, Generator* = 0);
+@@ -83,7 +85,7 @@ struct unwind_helper<false>
+
+ template <class Generator, class U>
+ inline typename Generator::result_type
+-#ifndef _MSC_VER
++#if (!defined(_MSC_VER) || _MSC_VER >= 1915)
+ unwind_type(U const& p, Generator*)
+ #else
+ unwind_type(U const& p, Generator* = 0)
+@@ -148,7 +150,7 @@ struct unwind_helper2<reference_to_pointer_>
+ // why bother?
+ template <class Generator, class U>
+ inline typename Generator::result_type
+-#ifndef _MSC_VER
++#if (!defined(_MSC_VER) || _MSC_VER >= 1915)
+ unwind_type(boost::type<U>*, Generator*)
+ #else
+ unwind_type(boost::type<U>*p =0, Generator* =0)

CMark/config.py

@@ -20,8 +20,28 @@
 
 	"manifest" : [
 
-		"lib/libcmark*{sharedLibraryExtension}*"
+		"lib/{libraryPrefix}cmark*{sharedLibraryExtension}*",
+		"lib/{libraryPrefix}cmark*.lib",
 
 	],
 
+	"platform:windows" : {
+
+		"commands" : [
+
+			"mkdir gafferBuild",
+			"cd gafferBuild && "
+				" cmake"
+				" -G {cmakeGenerator}"
+				" -D CMAKE_BUILD_TYPE={cmakeBuildType}"
+				" -D CMAKE_INSTALL_PREFIX={buildDir}"
+				" ..",
+
+			"cd gafferBuild && cmake --build . --config {cmakeBuildType} --target install -- -j {jobs}",
+			"copy {buildDir}\\bin\\{libraryPrefix}cmark*{sharedLibraryExtension}* {buildDir}\\lib\\",
+
+		],
+
+	}
+
 }