Skip to content

Commit

Permalink
add boost 1.67.0, without any patches
Browse files Browse the repository at this point in the history
issue #198
  • Loading branch information
Scott M Anderson committed Jul 20, 2018
1 parent 09f70fe commit 652c77e
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 2 deletions.
1 change: 1 addition & 0 deletions projects/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
|[ActiveMQ-CPP](http://activemq.apache.org/cms/ 'ActiveMQ CMS website')|[open](http://www.apache.org/licenses/LICENSE-2.0.html 'Apache 2.0')|ActiveMQ C++ Messaging Service (CMS) client library|3.9.0|[repo](https://github.com/smanders/activemq-cpp 'forked activemq-cpp repo on github')|[diff](https://github.com/smanders/activemq-cpp/compare/apache:activemq-cpp-3.9.0...xp-3.9.0 'patch/diff')|
|[APR](http://apr.apache.org/ 'Apache Portable Runtime Project website')|[open](http://www.apache.org/licenses/LICENSE-2.0.html 'Apache 2.0')|Apache Portable Runtime project|1.5.2|[repo](https://github.com/smanders/apr 'forked apr repo on github')|[diff](https://github.com/smanders/apr/compare/apache:1.5.2...xp1.5.2 'patch/diff')|
|[boost](http://www.boost.org/ 'Boost website')|[open](http://www.boost.org/users/license.html 'Boost Software License')|libraries that give C++ a boost|1.63.0|[repo](https://github.com/boostorg/boost 'boost repo on github')|none|
|[boost](http://www.boost.org/ 'Boost website')|[open](http://www.boost.org/users/license.html 'Boost Software License')|libraries that give C++ a boost|1.67.0|[repo](https://github.com/boostorg/boost 'boost repo on github')|none|
|[bzip2](http://www.bzip.org/ 'bzip2 website')|[open](http://www.bzip.org/index.html 'bzip2 BSD-style license')|lossless block-sorting data compression library|1.0.6|[repo](https://github.com/smanders/bzip2 'forked bzip2 repo on github')|[diff](https://github.com/smanders/bzip2/compare/v1.0.6...xp1.0.6 'patch/diff')|
|[c-ares](http://c-ares.haxx.se/ 'c-ares website')|[open](http://c-ares.haxx.se/license.html 'c-ares license: MIT license')|C library for asynchronous DNS requests (including name resolves)|1.10.0|[repo](https://github.com/smanders/c-ares 'forked c-ares repo on github')|[diff](https://github.com/smanders/c-ares/compare/c-ares:cares-1_10_0...xp-1_10_0 'patch/diff')|
|[ceres-solver](http://ceres-solver.org 'Ceres Solver website')|[open](http://ceres-solver.org/license.html 'New BSD License')|C++ library for modeling and solving large, complicated optimization problems|1.14.0|[repo](https://github.com/ceres-solver/ceres-solver 'ceres-solver repo on github')|[diff](https://github.com/smanders/ceres-solver/compare/ceres-solver:1.14.0...xp1.14.0 'patch/diff')|
Expand Down
2 changes: 1 addition & 1 deletion projects/boost.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ function(patch_boost)
return()
endif()
if(XP_DEFAULT)
xpListAppendIfDne(BOOST_VERSIONS ${BOOST_OLDVER}) # edit this to set default version(s) to build
xpListAppendIfDne(BOOST_VERSIONS ${BOOST_OLDVER} ${BOOST_NEWVER}) # edit this to set default version(s) to build
else()
if(XP_PRO_BOOST AND NOT (XP_PRO_BOOST${ov} OR XP_PRO_BOOST${nv}))
set(XP_PRO_BOOST${ov} ON CACHE BOOL "include boost${ov}" FORCE)
Expand Down
19 changes: 19 additions & 0 deletions projects/boost1_67.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# boost
set(VER 1.67.0)
string(REPLACE "." "_" VER_ ${VER}) # 1_67_0
string(REGEX REPLACE "([0-9]+)\\.([0-9]+)(\\.[0-9]+)?" "\\1_\\2" VER2_ ${VER}) # 1_67
xpProOption(boost${VER2_})
set(REPO https://github.com/boostorg/boost)
set(PRO_BOOST${VER2_}
NAME boost${VER2_}
WEB "boost" http://www.boost.org/ "Boost website"
LICENSE "open" http://www.boost.org/users/license.html "Boost Software License"
DESC "libraries that give C++ a boost"
REPO "repo" ${REPO} "boost repo on github"
VER ${VER}
GIT_ORIGIN git://github.com/boostorg/boost.git
GIT_TAG boost-${VER} # what to 'git checkout'
DLURL https://dl.bintray.com/boostorg/release/${VER}/source/boost_${VER_}.tar.bz2
DLMD5 ced776cb19428ab8488774e1415535ab
#SUBPRO boostbuild${VER2_} boostgil${VER2_} boostmpl${VER2_} boostunits${VER2_}
)
1 change: 0 additions & 1 deletion projects/use/usexp-boost-config.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ set(prj boost)
get_filename_component(XP_ROOTDIR ${CMAKE_CURRENT_LIST_DIR}/../.. ABSOLUTE)
get_filename_component(XP_ROOTDIR ${XP_ROOTDIR} ABSOLUTE) # remove relative parts
string(TOUPPER ${prj} PRJ)
set(XP_USE_LATEST_BOOST OFF)
if(NOT DEFINED XP_USE_LATEST_BOOST)
option(XP_USE_LATEST_BOOST "build with boost @BOOST_NEWVER@ instead of @BOOST_OLDVER@" OFF)
endif()
Expand Down

0 comments on commit 652c77e

Please sign in to comment.