From 85cf7be74edb5b9edbfb8aba603b6c75b0597d16 Mon Sep 17 00:00:00 2001 From: Dieter De Baets Date: Fri, 4 Nov 2022 11:31:32 +0100 Subject: [PATCH] updates to latest versions --- Build.bat | 6 +++--- BuildHelper.bat | 2 ++ LLVM.cmakeArgs | 2 +- LLVM.git | 2 +- libtiff.git | 2 +- oiio.git | 2 +- openexr.git | 2 +- pugixml.git | 2 +- pybind11.git | 2 +- winflexbison.git | 2 +- zlib.git | 2 +- 11 files changed, 14 insertions(+), 12 deletions(-) diff --git a/Build.bat b/Build.bat index f76fe43..6ba25ec 100644 --- a/Build.bat +++ b/Build.bat @@ -11,16 +11,16 @@ if not exist %outputDir% mkdir %outputDir% set module=%cwd%/%outputDir% -set compiler="Visual Studio 16 2019" +set compiler="Visual Studio 17 2022" set arch="x64" rem Boost is special (who would have guessed) -if not exist boost git clone -j8 --recurse-submodules --depth 1 --branch boost-1.77.0 https://github.com/boostorg/boost.git boost +if not exist boost git clone -j8 --recurse-submodules --depth 1 --branch boost-1.80.0 https://github.com/boostorg/boost.git boost pushd boost if not exist builddir mkdir builddir call bootstrap.bat if NOT ["%errorlevel%"]==["0"] pause -call .\b2.exe --prefix=%module% debug release link=shared threading=multi architecture=x86 address-model=64 toolset=msvc-14.2 runtime-link=shared --build-dir=builddir --build-type=complete stage install --with-filesystem --with-system --with-thread --with-regex +call .\b2.exe --prefix=%module% debug release link=shared threading=multi architecture=x86 address-model=64 toolset=msvc runtime-link=shared --build-dir=builddir --build-type=complete stage install --with-filesystem --with-system --with-thread --with-regex if NOT ["%errorlevel%"]==["0"] pause popd rem copy boost dlls to bin folder diff --git a/BuildHelper.bat b/BuildHelper.bat index ebaff46..a5da090 100644 --- a/BuildHelper.bat +++ b/BuildHelper.bat @@ -31,7 +31,9 @@ cmake -G %compiler% -A %arch% %invokeDir% -DCMAKE_DEBUG_POSTFIX=d -DCMAKE_INSTA if NOT ["%errorlevel%"]==["0"] pause if not exist ../../%root%.releaseOnly cmake --build . --target install -j 8 --config debug +if NOT ["%errorlevel%"]==["0"] pause cmake --build . --target install -j 8 --config release +if NOT ["%errorlevel%"]==["0"] pause %postBuild% diff --git a/LLVM.cmakeArgs b/LLVM.cmakeArgs index 4161529..21d2ca6 100644 --- a/LLVM.cmakeArgs +++ b/LLVM.cmakeArgs @@ -1 +1 @@ --D LLVM_ENABLE_PROJECTS='clang' -Thost=x64 -D LLVM_TARGETS_TO_BUILD=X86 \ No newline at end of file +-D LLVM_ENABLE_PROJECTS='clang' -Thost=x64 -D CMAKE_CROSSCOMPILING=ON -D CMAKE_SYSTEM_NAME='Windows' \ No newline at end of file diff --git a/LLVM.git b/LLVM.git index 0a7f93d..f4366cc 100644 --- a/LLVM.git +++ b/LLVM.git @@ -1 +1 @@ ---branch llvmorg-13.0.0 https://github.com/llvm/llvm-project.git \ No newline at end of file +--branch llvmorg-15.0.0 https://github.com/llvm/llvm-project.git \ No newline at end of file diff --git a/libtiff.git b/libtiff.git index eec595a..4856626 100644 --- a/libtiff.git +++ b/libtiff.git @@ -1 +1 @@ ---branch v4.3.0 https://gitlab.com/libtiff/libtiff.git \ No newline at end of file +--branch v4.4.0 https://gitlab.com/libtiff/libtiff.git \ No newline at end of file diff --git a/oiio.git b/oiio.git index a533234..e1bb90b 100644 --- a/oiio.git +++ b/oiio.git @@ -1 +1 @@ ---branch v2.3.17.0 https://github.com/OpenImageIO/oiio.git \ No newline at end of file +--branch v2.4.4.2 https://github.com/OpenImageIO/oiio.git \ No newline at end of file diff --git a/openexr.git b/openexr.git index aef961d..e4427af 100644 --- a/openexr.git +++ b/openexr.git @@ -1 +1 @@ ---branch v3.1.3 https://github.com/AcademySoftwareFoundation/openexr.git \ No newline at end of file +--branch v3.1.5 https://github.com/AcademySoftwareFoundation/openexr.git \ No newline at end of file diff --git a/pugixml.git b/pugixml.git index 98b20c2..df8fe17 100644 --- a/pugixml.git +++ b/pugixml.git @@ -1 +1 @@ ---branch master https://github.com/zeux/pugixml.git \ No newline at end of file +--branch v1.12.1 https://github.com/zeux/pugixml.git \ No newline at end of file diff --git a/pybind11.git b/pybind11.git index 7db6038..464092a 100644 --- a/pybind11.git +++ b/pybind11.git @@ -1 +1 @@ ---branch v2.9.0 https://github.com/pybind/pybind11 \ No newline at end of file +--branch v2.10.0 https://github.com/pybind/pybind11 \ No newline at end of file diff --git a/winflexbison.git b/winflexbison.git index 56aa557..9e2f75a 100644 --- a/winflexbison.git +++ b/winflexbison.git @@ -1 +1 @@ ---branch v2.5.24 https://github.com/lexxmark/winflexbison.git \ No newline at end of file +--branch v2.5.25 https://github.com/lexxmark/winflexbison.git \ No newline at end of file diff --git a/zlib.git b/zlib.git index a00e93d..25d9346 100644 --- a/zlib.git +++ b/zlib.git @@ -1 +1 @@ ---branch v1.2.11 https://github.com/madler/zlib.git \ No newline at end of file +--branch v1.2.13 https://github.com/madler/zlib.git \ No newline at end of file