More work

This commit is contained in:
Thomas Krijnen
2019-08-16 17:40:13 +02:00
parent dae35f59ce
commit ddeaf5a375
52 changed files with 4083 additions and 4184 deletions
+11
View File
@@ -157,6 +157,8 @@ set OCE_VERSION=OCE-0.18
set PYTHON_VERSION=3.4.3
set SWIG_VERSION=3.0.12
goto :Eigen
:: Note all of the dependencies have appropriate label so that user can easily skip something if wanted
:: by modifying this file and using goto.
:Boost
@@ -459,6 +461,15 @@ IF NOT %ERRORLEVEL%==0 GOTO :Error
call :InstallCMakeProject "%DEPENDENCY_DIR%\%BUILD_DIR%" %BUILD_CFG%
IF NOT %ERRORLEVEL%==0 GOTO :Error
:Eigen
set DEPENDENCY_NAME=eigen
call :DownloadFile http://bitbucket.org/eigen/eigen/get/3.3.7.zip "%DEPS_DIR%" eigen-eigen-323c052e1731.zip
IF NOT %ERRORLEVEL%==0 GOTO :Error
call :ExtractArchive eigen-eigen-323c052e1731.zip "%DEPS_DIR%" "%DEPS_DIR%\eigen"
IF NOT %ERRORLEVEL%==0 GOTO :Error
IF NOT EXIST "%INSTALL_DIR%\Eigen\Eigen". mkdir "%INSTALL_DIR%\Eigen\Eigen"
robocopy /MIR "%DEPS_DIR%\eigen-eigen-323c052e1731\Eigen" "%INSTALL_DIR%\Eigen\Eigen"
:Successful
echo.
call "%~dp0\utils\cecho.cmd" 0 10 "%PROJECT_NAME% dependencies built."
+2
View File
@@ -86,6 +86,7 @@ set MPFR_INCLUDE_DIR=%INSTALL_DIR%\mpfr
set MPFR_LIBRARY_DIR=%INSTALL_DIR%\mpfr
set VOXEL_INCLUDE_DIR=%INSTALL_DIR%\voxel\include
set VOXEL_LIBRARY_DIR=%INSTALL_DIR%\voxel\lib
set EIGEN_DIR=%INSTALL_DIR%\Eigen
echo.
call cecho.cmd 0 10 "Script configuration:"
@@ -115,6 +116,7 @@ echo MPFR_INCLUDE_DIR = %MPFR_INCLUDE_DIR%
echo MPFR_LIBRARY_DIR = %MPFR_LIBRARY_DIR%
echo VOXEL_INCLUDE_DIR = %VOXEL_INCLUDE_DIR%
echo VOXEL_LIBRARY_DIR = %VOXEL_LIBRARY_DIR%
echo EIGEN_DIR = %EIGEN_DIR%
echo.
echo CMAKE_INSTALL_PREFIX = %CMAKE_INSTALL_PREFIX%
echo.