mirror of
https://github.com/IfcOpenShell/IfcOpenShell.git
synced 2026-08-06 07:51:47 +00:00
run-cmake - use swig install dir
This commit is contained in:
+3
-3
@@ -96,7 +96,7 @@ if not defined PYTHONHOME set PYTHONHOME=%INSTALL_DIR%\Python%PY_VER_MAJOR_MINOR
|
|||||||
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
|
||||||
set PYTHON_EXECUTABLE=%PYTHONHOME%\python.exe
|
set PYTHON_EXECUTABLE=%PYTHONHOME%\python.exe
|
||||||
set SWIG_EXECUTABLE=%SWIG_DIR%\swig.exe
|
set SWIG_INSTALL_DIR=%INSTALL_DIR%\swigwin
|
||||||
set PATH=%PATH%;%PYTHONHOME%
|
set PATH=%PATH%;%PYTHONHOME%
|
||||||
set JSON_INCLUDE_DIR=%INSTALL_DIR%\json
|
set JSON_INCLUDE_DIR=%INSTALL_DIR%\json
|
||||||
if not defined ADD_COMMIT_SHA set ADD_COMMIT_SHA=Off
|
if not defined ADD_COMMIT_SHA set ADD_COMMIT_SHA=Off
|
||||||
@@ -159,12 +159,12 @@ call cecho.cmd 0 13 "Running CMake for %PROJECT_NAME%."
|
|||||||
IF NOT "%VS_TOOLSET_HOST%"=="" (
|
IF NOT "%VS_TOOLSET_HOST%"=="" (
|
||||||
cmake.exe %CMAKELISTS_DIR% -G %GENERATOR% -A %VS_PLATFORM% -T %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%" -DBoost_NO_BOOST_CMAKE=ON ^
|
||||||
-DCMAKE_PREFIX_PATH="%HDF5_INSTALL_DIR%;%OPENCOLLADA_INSTALL_DIR%" ^
|
-DCMAKE_PREFIX_PATH="%HDF5_INSTALL_DIR%;%OPENCOLLADA_INSTALL_DIR%;%SWIG_INSTALL_DIR%" ^
|
||||||
-DADD_COMMIT_SHA=%ADD_COMMIT_SHA% %ARGUMENTS%
|
-DADD_COMMIT_SHA=%ADD_COMMIT_SHA% %ARGUMENTS%
|
||||||
) ELSE (
|
) ELSE (
|
||||||
cmake.exe %CMAKELISTS_DIR% -G %GENERATOR% -A %VS_PLATFORM% ^
|
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%" -DBoost_NO_BOOST_CMAKE=ON ^
|
||||||
-DCMAKE_PREFIX_PATH="%HDF5_INSTALL_DIR%;%OPENCOLLADA_INSTALL_DIR%" ^
|
-DCMAKE_PREFIX_PATH="%HDF5_INSTALL_DIR%;%OPENCOLLADA_INSTALL_DIR%;%SWIG_INSTALL_DIR%" ^
|
||||||
-DADD_COMMIT_SHA=%ADD_COMMIT_SHA% %ARGUMENTS%
|
-DADD_COMMIT_SHA=%ADD_COMMIT_SHA% %ARGUMENTS%
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user