From 2af7470950d538760a1ec55f39d5ab3a6f2d6479 Mon Sep 17 00:00:00 2001 From: Andrej730 Date: Tue, 18 Nov 2025 18:51:23 +0500 Subject: [PATCH] run-cmake.bat - use boost installation path Now there's no need for BOOST_ROOT and BOOST_LIBRARYDIR anymore. --- win/build-deps.cmd | 10 +++++++--- win/run-cmake.bat | 17 ++++++++--------- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/win/build-deps.cmd b/win/build-deps.cmd index 6da1a7a57a..957c058ca7 100644 --- a/win/build-deps.cmd +++ b/win/build-deps.cmd @@ -389,6 +389,10 @@ popd :: DEPENDENCY_NAME is used for logging and DEPENDENCY_DIR for saving from some redundant typing set DEPENDENCY_NAME=Boost %BOOST_VERSION% set DEPENDENCY_DIR=%DEPS_DIR%\boost_%BOOST_VER% +set DEPENDENCY_INSTALL_DIR=%DEPENDENCY_DIR%\stage\%GEN_SHORTHAND% +echo BOOST_INSTALL_DIR=%DEPENDENCY_INSTALL_DIR%>>"%~dp0\%BUILD_DEPS_CACHE_PATH%" +:: Needed for CGAL build. +set BOOST_ROOT=%DEPENDENCY_DIR% set BOOST_LIBRARYDIR=%DEPENDENCY_DIR%\stage\%GEN_SHORTHAND%\lib :: NOTE Also zip download exists, if encountering problems with 7z for some reason. set ZIP_EXT=7z @@ -423,7 +427,7 @@ call cecho.cmd 0 13 "Building %DEPENDENCY_NAME% %BOOST_LIBS% Please be patient, IF EXIST "%DEPENDENCY_DIR%\bin.v2\project-cache.jam" del "%DEPS_DIR%\boost\bin.v2\project-cache.jam" call .\b2 toolset=%BOOST_TOOLSET% runtime-link=shared address-model=%ARCH_BITS% --abbreviate-paths -j%IFCOS_NUM_BUILD_PROCS% ^ - variant=%DEBUG_OR_RELEASE_LOWERCASE% %BOOST_WIN_API% %BOOST_LIBS% stage --stagedir=stage/%GEN_SHORTHAND% + variant=%DEBUG_OR_RELEASE_LOWERCASE% %BOOST_WIN_API% %BOOST_LIBS% stage --stagedir=%DEPENDENCY_INSTALL_DIR% IF NOT %ERRORLEVEL%==0 GOTO :Error @@ -633,13 +637,13 @@ cd "%DEPENDENCY_DIR%" git reset --hard git apply --ignore-whitespace "%~dp0patches\cgal_no_zlib.patch" call :RunCMake -DCMAKE_INSTALL_PREFIX="%INSTALL_DIR%\cgal" ^ - -DBOOST_ROOT="%DEPS_DIR%\boost_%BOOST_VER%" ^ + -DBOOST_ROOT="%BOOST_ROOT%" ^ -DGMP_INCLUDE_DIR="%INSTALL_DIR%\mpir" ^ -DGMP_LIBRARIES="%INSTALL_DIR%\mpir\mpir.lib" ^ -DMPFR_INCLUDE_DIR="%INSTALL_DIR%\mpfr" ^ -DMPFR_LIBRARIES="%INSTALL_DIR%\mpfr\mpfr.lib" ^ -DCGAL_HEADER_ONLY=On ^ - -DBOOST_LIBRARYDIR="%DEPS_DIR%\boost_%BOOST_VER%\stage\vs%VS_VER%-%VS_PLATFORM%\lib" + -DBOOST_LIBRARYDIR="%BOOST_LIBRARYDIR%" IF NOT %ERRORLEVEL%==0 GOTO :Error call :BuildSolution "%DEPENDENCY_DIR%\%BUILD_DIR%\CGAL.sln" %BUILD_CFG% IF NOT %ERRORLEVEL%==0 GOTO :Error diff --git a/win/run-cmake.bat b/win/run-cmake.bat index 7c121ef3df..9dfbbd6df3 100755 --- a/win/run-cmake.bat +++ b/win/run-cmake.bat @@ -79,12 +79,11 @@ popd IF NOT EXIST ..\%BUILD_DIR%. mkdir ..\%BUILD_DIR% pushd ..\%BUILD_DIR% -:: tfk: todo remove duplication -set BOOST_VERSION=1.86.0 -set BOOST_VER=%BOOST_VERSION:.=_% +:: Legacy setup. +if not defined BOOST_INSTALL_DIR ( + set BOOST_INSTALL_DIR=%DEPS_DIR%\boost_1_86_0\stage\%GEN_SHORTHAND% +) -set BOOST_ROOT=%DEPS_DIR%\boost_%BOOST_VER% -set BOOST_LIBRARYDIR=%BOOST_ROOT%\stage\%GEN_SHORTHAND%\lib if not defined OCC_INCLUDE_DIR set OCC_INCLUDE_DIR=%INSTALL_DIR%\oce\include\oce if not defined OCC_LIBRARY_DIR set OCC_LIBRARY_DIR=%INSTALL_DIR%\oce\Win%ARCH_BITS%\lib set OPENCOLLADA_INSTALL_DIR=%INSTALL_DIR%\OpenCOLLADA @@ -127,7 +126,7 @@ echo Toolset = %VS_TOOLSET% echo Arguments = %ARGUMENTS% echo. call cecho.cmd 0 10 "Dependency Environment Variables for %PROJECT_NAME%:" -echo BOOST_ROOT = %BOOST_ROOT% +echo BOOST_INSTALL_DIR = %BOOST_INSTALL_DIR% echo BOOST_LIBRARYDIR = %BOOST_LIBRARYDIR% echo OCC_INCLUDE_DIR = %OCC_INCLUDE_DIR% echo OCC_LIBRARY_DIR = %OCC_LIBRARY_DIR% @@ -167,17 +166,17 @@ echo "Running CMake for %PROJECT_NAME%." set CMAKE_PREFIX_PATH=%HDF5_INSTALL_DIR%;%OPENCOLLADA_INSTALL_DIR%;%SWIG_INSTALL_DIR% set CMAKE_PREFIX_PATH=%CMAKE_PREFIX_PATH%;%ROCKSDB_INSTALL_DIR%;%ZSTD_INSTALL_DIR% -set CMAKE_PREFIX_PATH=%CMAKE_PREFIX_PATH%;%BOOST_ROOT%;%CCACHE_INSTALL_DIR% +set CMAKE_PREFIX_PATH=%CMAKE_PREFIX_PATH%;%BOOST_INSTALL_DIR%;%CCACHE_INSTALL_DIR% IF NOT "%VS_TOOLSET_HOST%"=="" ( cmake.exe %CMAKELISTS_DIR% -G %GENERATOR% -A %VS_PLATFORM% -T %VS_TOOLSET_HOST% ^ - -DCMAKE_INSTALL_PREFIX="%CMAKE_INSTALL_PREFIX%" -DBoost_NO_BOOST_CMAKE=ON ^ + -DCMAKE_INSTALL_PREFIX="%CMAKE_INSTALL_PREFIX%" ^ -DWITH_ROCKSDB=On -DWITH_ZSTD=On ^ -DCMAKE_PREFIX_PATH="%CMAKE_PREFIX_PATH%" ^ -DADD_COMMIT_SHA=%ADD_COMMIT_SHA% %ARGUMENTS% ) ELSE ( cmake.exe %CMAKELISTS_DIR% -G %GENERATOR% -A %VS_PLATFORM% ^ - -DCMAKE_INSTALL_PREFIX="%CMAKE_INSTALL_PREFIX%" -DBoost_NO_BOOST_CMAKE=ON ^ + -DCMAKE_INSTALL_PREFIX="%CMAKE_INSTALL_PREFIX%" ^ -DWITH_ROCKSDB=On -DWITH_ZSTD=On ^ -DCMAKE_PREFIX_PATH="%CMAKE_PREFIX_PATH%" ^ -DADD_COMMIT_SHA=%ADD_COMMIT_SHA% %ARGUMENTS%