From d876c001e23231b789614ca956ea78b2e818fd1b Mon Sep 17 00:00:00 2001 From: Andrej730 Date: Thu, 11 Dec 2025 17:28:45 +0500 Subject: [PATCH] Remove deprecated `BOOST_LIBRARYDIR` var --- cmake/CMakeLists.txt | 1 - src/svgfill/README.md | 1 - win/build-deps.cmd | 5 +---- win/run-cmake.bat | 1 - 4 files changed, 1 insertion(+), 7 deletions(-) diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt index 98fb806a26..7dbd2d62f6 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt @@ -181,7 +181,6 @@ if(BUILD_SHARED_LIBS) endif() UNIFY_ENVVARS_AND_CACHE(BOOST_ROOT) -UNIFY_ENVVARS_AND_CACHE(BOOST_LIBRARYDIR) if(NOT MINIMAL_BUILD) UNIFY_ENVVARS_AND_CACHE(PYTHON_INCLUDE_DIR) diff --git a/src/svgfill/README.md b/src/svgfill/README.md index dc0348af7c..1e2193e6f8 100644 --- a/src/svgfill/README.md +++ b/src/svgfill/README.md @@ -23,7 +23,6 @@ Installation is shown based on the IfcOpenShell build script directory output: set IFCOPENSHELL_ROOT=..\path\to\ifcopenshell\directory\ cmake -DBOOST_ROOT=%IFCOPENSHELL_ROOT%\deps\boost_1_67_0 ^ - -DBOOST_LIBRARYDIR=%IFCOPENSHELL_ROOT%\deps\boost_1_67_0\stage\vs2017-Win32\lib ^ -DLIBXML2_INCLUDE_DIR=%IFCOPENSHELL_ROOT%\deps\OpenCOLLADA\Externals\LibXML\include ^ -DLIBXML2_LIBRARIES=%IFCOPENSHELL_ROOT%\deps-vs2017-x86-installed\OpenCOLLADA\lib\opencollada\xml.lib ^ -DCGAL_INCLUDE_DIR=%IFCOPENSHELL_ROOT%\deps-vs2017-x86-installed\cgal\include ^ diff --git a/win/build-deps.cmd b/win/build-deps.cmd index b57ca4d5d5..b2a1a90289 100644 --- a/win/build-deps.cmd +++ b/win/build-deps.cmd @@ -395,7 +395,6 @@ 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 set BOOST_ZIP=boost-%BOOST_VERSION%-b2-nodocs.%ZIP_EXT% @@ -653,8 +652,7 @@ call :RunCMake -DCMAKE_INSTALL_PREFIX="%INSTALL_DIR%\cgal" ^ -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="%BOOST_LIBRARYDIR%" + -DCGAL_HEADER_ONLY=On IF NOT %ERRORLEVEL%==0 GOTO :Error call :BuildSolution "%DEPENDENCY_DIR%\%BUILD_DIR%\CGAL.sln" %BUILD_CFG% IF NOT %ERRORLEVEL%==0 GOTO :Error @@ -771,7 +769,6 @@ call :MarkInstallation :: -DPXR_BUILD_USD_TOOLS=FALSE ^ :: -DPXR_BUILD_TESTS=FALSE ^ :: -DBUILD_SHARED_LIBS=Off ^ -:: -DBOOST_LIBRARYDIR="%DEPS_DIR%\boost_%BOOST_VER%\stage\vs%VS_VER%-%VS_PLATFORM%\lib" :: IF NOT %ERRORLEVEL%==0 GOTO :Error :: call :BuildSolution "%DEPENDENCY_DIR%\%BUILD_DIR%\USD.sln" %BUILD_CFG% :: IF NOT %ERRORLEVEL%==0 GOTO :Error diff --git a/win/run-cmake.bat b/win/run-cmake.bat index 7b67a4f022..397887eb6c 100755 --- a/win/run-cmake.bat +++ b/win/run-cmake.bat @@ -127,7 +127,6 @@ echo Arguments = %ARGUMENTS% echo. call cecho.cmd 0 10 "Dependency Environment Variables for %PROJECT_NAME%:" echo BOOST_INSTALL_DIR = %BOOST_INSTALL_DIR% -echo BOOST_LIBRARYDIR = %BOOST_LIBRARYDIR% :: OCC_INCLUDE_DIR / OCC_LIBRARY_DIR are legacy vars, they're not defined by build-deps.cmd anymore. echo OCC_INCLUDE_DIR = %OCC_INCLUDE_DIR% echo OCC_LIBRARY_DIR = %OCC_LIBRARY_DIR%