Skip to content

Commit

Permalink
Extend CMake CI to build static libs only
Browse files Browse the repository at this point in the history
  • Loading branch information
jen20 authored and James Nugent committed Jul 24, 2015
1 parent 60e737f commit 8401016
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 1 deletion.
5 changes: 5 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,11 @@ env:
- ACTION="ci/build_cmake.sh" VERSION="cpp03" ARCH="64" LIBPATH="/usr/local/lib" BOOST=""
- ACTION="ci/build_cmake.sh" VERSION="cpp03" ARCH="32" LIBPATH="/usr/local/lib32" BOOST="boost" BOOST_INC="/usr/local/boost"
- ACTION="ci/build_cmake.sh" VERSION="cpp03" ARCH="32" LIBPATH="/usr/local/lib32" BOOST=""
- ACTION="ci/build_cmake.sh" VERSION="cpp03" ARCH="64" LIBPATH="/usr/local/lib" BOOST="boost" BOOST_INC="/usr/local/boost" SHARED="OFF"
- ACTION="ci/build_cmake.sh" VERSION="cpp03" ARCH="64" LIBPATH="/usr/local/lib" BOOST="" SHARED="OFF"
- ACTION="ci/build_cmake.sh" VERSION="cpp03" ARCH="32" LIBPATH="/usr/local/lib32" BOOST="boost" BOOST_INC="/usr/local/boost" SHARED="OFF"
- ACTION="ci/build_cmake.sh" VERSION="cpp03" ARCH="32" LIBPATH="/usr/local/lib32" BOOST="" SHARED="OFF"


before_script:
- export PATH=/usr/local/bin:$PATH
Expand Down
9 changes: 8 additions & 1 deletion ci/build_cmake.sh
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,14 @@ else
boost_dir=""
fi

cmake $cpp11 $bit32 $boost $boost_dir ..
if [ "$5" = "OFF" ]
then
shared="-DMSGPACK_ENABLE_SHARED=OFF"
else
shared=""
fi

cmake $cpp11 $bit32 $boost $boost_dir $shared ..

ret=$?
if [ $ret -ne 0 ]
Expand Down

0 comments on commit 8401016

Please sign in to comment.