Skip to content

Commit 1b809ed

Browse files
aothmsaothms
committed
Update boost version
1 parent 8c0bcc4 commit 1b809ed

3 files changed

Lines changed: 29 additions & 19 deletions

File tree

‎nix/build-all.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,10 @@
6464
OCCT_VERSION="7.2.0"
6565
OCCT_HASH="88af392"
6666
PYTHON_VERSIONS=["2.7.12", "3.2.6", "3.3.6", "3.4.6", "3.5.3", "3.6.2"]
67-
BOOST_VERSION="1.59.0"
67+
BOOST_VERSION="1.67.0"
6868
PCRE_VERSION="8.39"
6969
LIBXML_VERSION="2.9.3"
70-
CMAKE_VERSION="3.4.1"
70+
CMAKE_VERSION="3.11.4"
7171
ICU_VERSION="56.1"
7272
SWIG_VERSION="3.0.12"
7373

‎win/build-deps.cmd‎

Lines changed: 21 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,14 @@ FOR %%i IN (powershell git cmake) DO (
8585
where.exe %%i 1> NUL 2> NUL || call cecho.cmd 0 12 "Required tool `'%%i`' not installed or not added to PATH" && goto :ErrorAndPrintUsage
8686
)
8787

88+
cmake --version | findstr version > temp.txt
89+
set /p CMAKE_VERSION=<temp.txt
90+
del temp.txt
91+
if "%CMAKE_VERSION%" LSS "cmake version 3.11.4" (
92+
echo "CMake v3.11.4 or higher is required"
93+
goto :ErrorAndPrintUsage
94+
)
95+
8896
:: Print build configuration information
8997

9098
call cecho.cmd 0 10 "Script configuration:"
@@ -141,41 +149,38 @@ cd "%DEPS_DIR%"
141149
:: by modifying this file and using goto.
142150
:Boost
143151
:: NOTE Boost < 1.64 doesn't work without tricks if the user has only VS 2017 installed and no earlier versions.
144-
set BOOST_VERSION=1.65.1
145-
:: DEPENDENCY_NAME is used for logging and DEPENDENCY_DIR for saving from some redundant typing
146-
set DEPENDENCY_NAME=Boost %BOOST_VERSION%
147-
set DEPENDENCY_DIR="%DEPS_DIR%\boost"
152+
set BOOST_VERSION=1.67.0
148153
:: Version string with underscores instead of dots.
149154
set BOOST_VER=%BOOST_VERSION:.=_%
150-
REM set BOOST_ROOT=%DEPS_DIR%\boost
151-
REM set BOOST_INCLUDEDIR=%DEPS_DIR%\boost
152-
set BOOST_LIBRARYDIR=%DEPS_DIR%\boost\stage\%VS_PLATFORM%\lib
155+
:: DEPENDENCY_NAME is used for logging and DEPENDENCY_DIR for saving from some redundant typing
156+
set DEPENDENCY_NAME=Boost %BOOST_VERSION%
157+
set DEPENDENCY_DIR="%DEPS_DIR%\boost_%BOOST_VER%"
158+
set BOOST_LIBRARYDIR=%DEPENDENCY_DIR%\stage\%VS_PLATFORM%\lib
153159
:: NOTE Also zip download exists, if encountering problems with 7z for some reason.
154160
set ZIP_EXT=7z
155161
set BOOST_ZIP=boost_%BOOST_VER%.%ZIP_EXT%
156162

157163
call :DownloadFile https://dl.bintray.com/boostorg/release/%BOOST_VERSION%/source/%BOOST_ZIP% "%DEPS_DIR%" %BOOST_ZIP%
158164

159165
IF NOT %ERRORLEVEL%==0 GOTO :Error
160-
call :ExtractArchive %BOOST_ZIP% "%DEPS_DIR%" "%DEPS_DIR%\boost"
166+
call :ExtractArchive %BOOST_ZIP% "%DEPS_DIR%" "%DEPENDENCY_DIR%"
161167
IF NOT %ERRORLEVEL%==0 GOTO :Error
162168

163169
:: Build Boost build script
164-
if not exist "%DEPS_DIR%\boost\project-config.jam". (
170+
if not exist "%DEPENDENCY_DIR%\project-config.jam". (
165171
cd "%DEPS_DIR%"
166-
ren boost_%BOOST_VER% boost
167-
IF NOT EXIST "%DEPS_DIR%\boost\boost.css" GOTO :Error
168-
cd "%DEPS_DIR%\boost"
172+
IF NOT EXIST "%DEPENDENCY_DIR%\boost.css" GOTO :Error
173+
cd "%DEPENDENCY_DIR%"
169174
call cecho.cmd 0 13 "Building Boost build script."
170175
call bootstrap msvc
171176
IF NOT %ERRORLEVEL%==0 GOTO :Error
172177
)
173178

174179
set BOOST_LIBS=--with-system --with-regex --with-thread --with-program_options --with-date_time --with-iostreams --with-filesystem
175180
:: NOTE Boost is fast to build with limited set of libraries so build it always.
176-
cd "%DEPS_DIR%\boost"
181+
cd "%DEPENDENCY_DIR%"
177182
call cecho.cmd 0 13 "Building %DEPENDENCY_NAME% %BOOST_LIBS% Please be patient, this will take a while."
178-
IF EXIST "%DEPS_DIR%\boost\bin.v2\project-cache.jam" del "%DEPS_DIR%\boost\bin.v2\project-cache.jam"
183+
IF EXIST "%DEPENDENCY_DIR%\bin.v2\project-cache.jam" del "%DEPS_DIR%\boost\bin.v2\project-cache.jam"
179184
:: BOOST_VC_VER can be empty (or needs to be) for newer VS versions
180185
set BOOST_VC_VER=
181186
if %VS_VER% LSS 2017 (
@@ -186,6 +191,8 @@ call .\b2 toolset=msvc%BOOST_VC_VER% runtime-link=static address-model=%ARCH_BIT
186191
variant=%DEBUG_OR_RELEASE_LOWERCASE% %BOOST_LIBS% stage --stagedir=stage/vs%VS_VER%-%VS_PLATFORM%
187192
IF NOT %ERRORLEVEL%==0 GOTO :Error
188193

194+
goto :Successful
195+
189196
:ICU
190197
set DEPENDENCY_NAME=ICU
191198
set DEPENDENCY_DIR=N/A

‎win/run-cmake.bat‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,12 @@ popd
5858
IF NOT EXIST ..\%BUILD_DIR%. mkdir ..\%BUILD_DIR%
5959
pushd ..\%BUILD_DIR%
6060

61-
set BOOST_ROOT=%DEPS_DIR%\boost
62-
REM set BOOST_INCLUDEDIR=%DEPS_DIR%\boost\boost
63-
set BOOST_LIBRARYDIR=%DEPS_DIR%\boost\stage\vs%VS_VER%-%VS_PLATFORM%\lib
61+
:: tfk: todo remove duplication
62+
set BOOST_VERSION=1.67.0
63+
set BOOST_VER=%BOOST_VERSION:.=_%
64+
65+
set BOOST_ROOT=%DEPS_DIR%\boost_%BOOST_VER%
66+
set BOOST_LIBRARYDIR=%BOOST_ROOT%\stage\vs%VS_VER%-%VS_PLATFORM%\lib
6467
set ICU_INCLUDE_DIR=%INSTALL_DIR%\icu\include
6568
set ICU_LIBRARY_DIR=%INSTALL_DIR%\icu\lib
6669
if not defined OCC_INCLUDE_DIR set OCC_INCLUDE_DIR=%INSTALL_DIR%\oce\include\oce

0 commit comments

Comments
 (0)