Skip to content

Commit d876c00

Browse files
committed
Remove deprecated BOOST_LIBRARYDIR var
1 parent 20d6547 commit d876c00

4 files changed

Lines changed: 1 addition & 7 deletions

File tree

cmake/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,6 @@ if(BUILD_SHARED_LIBS)
181181
endif()
182182

183183
UNIFY_ENVVARS_AND_CACHE(BOOST_ROOT)
184-
UNIFY_ENVVARS_AND_CACHE(BOOST_LIBRARYDIR)
185184

186185
if(NOT MINIMAL_BUILD)
187186
UNIFY_ENVVARS_AND_CACHE(PYTHON_INCLUDE_DIR)

src/svgfill/README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ Installation is shown based on the IfcOpenShell build script directory output:
2323

2424
set IFCOPENSHELL_ROOT=..\path\to\ifcopenshell\directory\
2525
cmake -DBOOST_ROOT=%IFCOPENSHELL_ROOT%\deps\boost_1_67_0 ^
26-
-DBOOST_LIBRARYDIR=%IFCOPENSHELL_ROOT%\deps\boost_1_67_0\stage\vs2017-Win32\lib ^
2726
-DLIBXML2_INCLUDE_DIR=%IFCOPENSHELL_ROOT%\deps\OpenCOLLADA\Externals\LibXML\include ^
2827
-DLIBXML2_LIBRARIES=%IFCOPENSHELL_ROOT%\deps-vs2017-x86-installed\OpenCOLLADA\lib\opencollada\xml.lib ^
2928
-DCGAL_INCLUDE_DIR=%IFCOPENSHELL_ROOT%\deps-vs2017-x86-installed\cgal\include ^

win/build-deps.cmd

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -395,7 +395,6 @@ set DEPENDENCY_INSTALL_DIR=%DEPENDENCY_DIR%\stage\%GEN_SHORTHAND%
395395
echo BOOST_INSTALL_DIR=%DEPENDENCY_INSTALL_DIR%>>"%~dp0\%BUILD_DEPS_CACHE_PATH%"
396396
:: Needed for CGAL build.
397397
set BOOST_ROOT=%DEPENDENCY_DIR%
398-
set BOOST_LIBRARYDIR=%DEPENDENCY_DIR%\stage\%GEN_SHORTHAND%\lib
399398
:: NOTE Also zip download exists, if encountering problems with 7z for some reason.
400399
set ZIP_EXT=7z
401400
set BOOST_ZIP=boost-%BOOST_VERSION%-b2-nodocs.%ZIP_EXT%
@@ -653,8 +652,7 @@ call :RunCMake -DCMAKE_INSTALL_PREFIX="%INSTALL_DIR%\cgal" ^
653652
-DGMP_LIBRARIES="%INSTALL_DIR%\mpir\mpir.lib" ^
654653
-DMPFR_INCLUDE_DIR="%INSTALL_DIR%\mpfr" ^
655654
-DMPFR_LIBRARIES="%INSTALL_DIR%\mpfr\mpfr.lib" ^
656-
-DCGAL_HEADER_ONLY=On ^
657-
-DBOOST_LIBRARYDIR="%BOOST_LIBRARYDIR%"
655+
-DCGAL_HEADER_ONLY=On
658656
IF NOT %ERRORLEVEL%==0 GOTO :Error
659657
call :BuildSolution "%DEPENDENCY_DIR%\%BUILD_DIR%\CGAL.sln" %BUILD_CFG%
660658
IF NOT %ERRORLEVEL%==0 GOTO :Error
@@ -771,7 +769,6 @@ call :MarkInstallation
771769
:: -DPXR_BUILD_USD_TOOLS=FALSE ^
772770
:: -DPXR_BUILD_TESTS=FALSE ^
773771
:: -DBUILD_SHARED_LIBS=Off ^
774-
:: -DBOOST_LIBRARYDIR="%DEPS_DIR%\boost_%BOOST_VER%\stage\vs%VS_VER%-%VS_PLATFORM%\lib"
775772
:: IF NOT %ERRORLEVEL%==0 GOTO :Error
776773
:: call :BuildSolution "%DEPENDENCY_DIR%\%BUILD_DIR%\USD.sln" %BUILD_CFG%
777774
:: IF NOT %ERRORLEVEL%==0 GOTO :Error

win/run-cmake.bat

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,6 @@ echo Arguments = %ARGUMENTS%
127127
echo.
128128
call cecho.cmd 0 10 "Dependency Environment Variables for %PROJECT_NAME%:"
129129
echo BOOST_INSTALL_DIR = %BOOST_INSTALL_DIR%
130-
echo BOOST_LIBRARYDIR = %BOOST_LIBRARYDIR%
131130
:: OCC_INCLUDE_DIR / OCC_LIBRARY_DIR are legacy vars, they're not defined by build-deps.cmd anymore.
132131
echo OCC_INCLUDE_DIR = %OCC_INCLUDE_DIR%
133132
echo OCC_LIBRARY_DIR = %OCC_LIBRARY_DIR%

0 commit comments

Comments
 (0)