mirror of
https://github.com/IfcOpenShell/IfcOpenShell.git
synced 2026-09-21 14:23:53 +00:00
run-cmake: drop default value for SWIG_INSTALL_DIR
Caching of version path was introduced in c5f6d47, awhile ago, removing it, since all new installations are already using the cache instead of this default fallback.
`robocopy` line was an artifact from old layout.
This commit is contained in:
@@ -620,7 +620,6 @@ call :BuildCMakeProject "%DEPENDENCY_DIR%\%BUILD_DIR%" Release
|
|||||||
IF NOT %ERRORLEVEL%==0 GOTO :Error
|
IF NOT %ERRORLEVEL%==0 GOTO :Error
|
||||||
call :InstallCMakeProject "%DEPENDENCY_DIR%\%BUILD_DIR%" Release
|
call :InstallCMakeProject "%DEPENDENCY_DIR%\%BUILD_DIR%" Release
|
||||||
IF NOT %ERRORLEVEL%==0 GOTO :Error
|
IF NOT %ERRORLEVEL%==0 GOTO :Error
|
||||||
robocopy "%INSTALL_DIR%\swigwin\bin" "%INSTALL_DIR%\swigwin" /move /e
|
|
||||||
|
|
||||||
goto :Successful
|
goto :Successful
|
||||||
|
|
||||||
|
|||||||
@@ -104,9 +104,6 @@ for /f "usebackq delims=" %%v in (`
|
|||||||
set PYTHON_INCLUDE_DIR=%PYTHONHOME%\include
|
set PYTHON_INCLUDE_DIR=%PYTHONHOME%\include
|
||||||
set PYTHON_LIBRARY=%PYTHONHOME%\libs\python%PY_VER_MAJOR_MINOR%.lib
|
set PYTHON_LIBRARY=%PYTHONHOME%\libs\python%PY_VER_MAJOR_MINOR%.lib
|
||||||
|
|
||||||
:: `swigwin` is a legacy installation folder name, before we started using versioned folders.
|
|
||||||
:: we can remove it later.
|
|
||||||
if not defined SWIG_INSTALL_DIR set SWIG_INSTALL_DIR=%INSTALL_DIR%\swigwin
|
|
||||||
set JSON_INCLUDE_DIR=%INSTALL_DIR%\json
|
set JSON_INCLUDE_DIR=%INSTALL_DIR%\json
|
||||||
if defined ADD_COMMIT_SHA (
|
if defined ADD_COMMIT_SHA (
|
||||||
set ADD_COMMIT_SHA=ON
|
set ADD_COMMIT_SHA=ON
|
||||||
|
|||||||
Reference in New Issue
Block a user