Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Updated build scripts so that we don't build boost.
  • Loading branch information
glynos committed Jan 31, 2016
commit 10874f3c569b51e78815d2ad6fe400e19ff7ff65
2 changes: 0 additions & 2 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ cd build
cmake -DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE \
-DBUILD_SHARED_LIBS=$BUILD_SHARED_LIBS \
-DCPP-NETLIB_ENABLE_HTTPS=$ENABLE_HTTPS \
-DBOOST_INCLUDEDIR="${HOME}/${CC}-boost_${BOOST_VERSION}/include" \
-DBOOST_LIBRARYDIR="${HOME}/${CC}-boost_${BOOST_VERSION}/lib" \
-DCMAKE_CXX_FLAGS="-std=c++11 ${CMAKE_CXX_FLAGS}" \
..
make -j2
Expand Down
8 changes: 1 addition & 7 deletions install-boost.sh
Original file line number Diff line number Diff line change
@@ -1,13 +1,7 @@
#!/bin/sh
set -e

if [ ! -d "${HOME}/${CC}-boost_${BOOST_VERSION}/include" ]; then
if [ ! -d "${BOOST_ROOT}" ]; then
wget -O boost_${BOOST_VERSION}.tar.bz2 http://sourceforge.net/projects/boost/files/boost/${BOOST_VER}/boost_${BOOST_VERSION}.tar.bz2/download
tar jxf boost_${BOOST_VERSION}.tar.bz2
cd boost_${BOOST_VERSION}
./bootstrap.sh --with-toolset=$TOOLSET --prefix=${HOME}/${CC}-boost_${BOOST_VERSION}
./b2 --stagedir=. -j4 --layout=tagged variant=debug,release link=shared threading=multi address-model=64 cxxflags='-std=c++11' install >boost-build.log 2>&1
cd ..
rm -rf boost_${BOOST_VERSION}
rm -rf boost_${BOOST_VERSION}.tar.bz2
fi