mirror of
https://github.com/IfcOpenShell/IfcOpenShell.git
synced 2026-09-22 23:02:39 +00:00
Remove deprecated BOOST_LIBRARYDIR var
This commit is contained in:
@@ -181,7 +181,6 @@ if(BUILD_SHARED_LIBS)
|
|||||||
endif()
|
endif()
|
||||||
|
|
||||||
UNIFY_ENVVARS_AND_CACHE(BOOST_ROOT)
|
UNIFY_ENVVARS_AND_CACHE(BOOST_ROOT)
|
||||||
UNIFY_ENVVARS_AND_CACHE(BOOST_LIBRARYDIR)
|
|
||||||
|
|
||||||
if(NOT MINIMAL_BUILD)
|
if(NOT MINIMAL_BUILD)
|
||||||
UNIFY_ENVVARS_AND_CACHE(PYTHON_INCLUDE_DIR)
|
UNIFY_ENVVARS_AND_CACHE(PYTHON_INCLUDE_DIR)
|
||||||
|
|||||||
@@ -23,7 +23,6 @@ Installation is shown based on the IfcOpenShell build script directory output:
|
|||||||
|
|
||||||
set IFCOPENSHELL_ROOT=..\path\to\ifcopenshell\directory\
|
set IFCOPENSHELL_ROOT=..\path\to\ifcopenshell\directory\
|
||||||
cmake -DBOOST_ROOT=%IFCOPENSHELL_ROOT%\deps\boost_1_67_0 ^
|
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_INCLUDE_DIR=%IFCOPENSHELL_ROOT%\deps\OpenCOLLADA\Externals\LibXML\include ^
|
||||||
-DLIBXML2_LIBRARIES=%IFCOPENSHELL_ROOT%\deps-vs2017-x86-installed\OpenCOLLADA\lib\opencollada\xml.lib ^
|
-DLIBXML2_LIBRARIES=%IFCOPENSHELL_ROOT%\deps-vs2017-x86-installed\OpenCOLLADA\lib\opencollada\xml.lib ^
|
||||||
-DCGAL_INCLUDE_DIR=%IFCOPENSHELL_ROOT%\deps-vs2017-x86-installed\cgal\include ^
|
-DCGAL_INCLUDE_DIR=%IFCOPENSHELL_ROOT%\deps-vs2017-x86-installed\cgal\include ^
|
||||||
|
|||||||
+1
-4
@@ -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%"
|
echo BOOST_INSTALL_DIR=%DEPENDENCY_INSTALL_DIR%>>"%~dp0\%BUILD_DEPS_CACHE_PATH%"
|
||||||
:: Needed for CGAL build.
|
:: Needed for CGAL build.
|
||||||
set BOOST_ROOT=%DEPENDENCY_DIR%
|
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.
|
:: NOTE Also zip download exists, if encountering problems with 7z for some reason.
|
||||||
set ZIP_EXT=7z
|
set ZIP_EXT=7z
|
||||||
set BOOST_ZIP=boost-%BOOST_VERSION%-b2-nodocs.%ZIP_EXT%
|
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" ^
|
-DGMP_LIBRARIES="%INSTALL_DIR%\mpir\mpir.lib" ^
|
||||||
-DMPFR_INCLUDE_DIR="%INSTALL_DIR%\mpfr" ^
|
-DMPFR_INCLUDE_DIR="%INSTALL_DIR%\mpfr" ^
|
||||||
-DMPFR_LIBRARIES="%INSTALL_DIR%\mpfr\mpfr.lib" ^
|
-DMPFR_LIBRARIES="%INSTALL_DIR%\mpfr\mpfr.lib" ^
|
||||||
-DCGAL_HEADER_ONLY=On ^
|
-DCGAL_HEADER_ONLY=On
|
||||||
-DBOOST_LIBRARYDIR="%BOOST_LIBRARYDIR%"
|
|
||||||
IF NOT %ERRORLEVEL%==0 GOTO :Error
|
IF NOT %ERRORLEVEL%==0 GOTO :Error
|
||||||
call :BuildSolution "%DEPENDENCY_DIR%\%BUILD_DIR%\CGAL.sln" %BUILD_CFG%
|
call :BuildSolution "%DEPENDENCY_DIR%\%BUILD_DIR%\CGAL.sln" %BUILD_CFG%
|
||||||
IF NOT %ERRORLEVEL%==0 GOTO :Error
|
IF NOT %ERRORLEVEL%==0 GOTO :Error
|
||||||
@@ -771,7 +769,6 @@ call :MarkInstallation
|
|||||||
:: -DPXR_BUILD_USD_TOOLS=FALSE ^
|
:: -DPXR_BUILD_USD_TOOLS=FALSE ^
|
||||||
:: -DPXR_BUILD_TESTS=FALSE ^
|
:: -DPXR_BUILD_TESTS=FALSE ^
|
||||||
:: -DBUILD_SHARED_LIBS=Off ^
|
:: -DBUILD_SHARED_LIBS=Off ^
|
||||||
:: -DBOOST_LIBRARYDIR="%DEPS_DIR%\boost_%BOOST_VER%\stage\vs%VS_VER%-%VS_PLATFORM%\lib"
|
|
||||||
:: IF NOT %ERRORLEVEL%==0 GOTO :Error
|
:: IF NOT %ERRORLEVEL%==0 GOTO :Error
|
||||||
:: call :BuildSolution "%DEPENDENCY_DIR%\%BUILD_DIR%\USD.sln" %BUILD_CFG%
|
:: call :BuildSolution "%DEPENDENCY_DIR%\%BUILD_DIR%\USD.sln" %BUILD_CFG%
|
||||||
:: IF NOT %ERRORLEVEL%==0 GOTO :Error
|
:: IF NOT %ERRORLEVEL%==0 GOTO :Error
|
||||||
|
|||||||
@@ -127,7 +127,6 @@ echo Arguments = %ARGUMENTS%
|
|||||||
echo.
|
echo.
|
||||||
call cecho.cmd 0 10 "Dependency Environment Variables for %PROJECT_NAME%:"
|
call cecho.cmd 0 10 "Dependency Environment Variables for %PROJECT_NAME%:"
|
||||||
echo BOOST_INSTALL_DIR = %BOOST_INSTALL_DIR%
|
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.
|
:: 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_INCLUDE_DIR = %OCC_INCLUDE_DIR%
|
||||||
echo OCC_LIBRARY_DIR = %OCC_LIBRARY_DIR%
|
echo OCC_LIBRARY_DIR = %OCC_LIBRARY_DIR%
|
||||||
|
|||||||
Reference in New Issue
Block a user