Skip to content

Commit 8401016

Browse files
jen20James Nugent
authored andcommitted
Extend CMake CI to build static libs only
1 parent 60e737f commit 8401016

File tree

2 files changed

+13
-1
lines changed

2 files changed

+13
-1
lines changed

.travis.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,11 @@ env:
4141
- ACTION="ci/build_cmake.sh" VERSION="cpp03" ARCH="64" LIBPATH="/usr/local/lib" BOOST=""
4242
- ACTION="ci/build_cmake.sh" VERSION="cpp03" ARCH="32" LIBPATH="/usr/local/lib32" BOOST="boost" BOOST_INC="/usr/local/boost"
4343
- ACTION="ci/build_cmake.sh" VERSION="cpp03" ARCH="32" LIBPATH="/usr/local/lib32" BOOST=""
44+
- ACTION="ci/build_cmake.sh" VERSION="cpp03" ARCH="64" LIBPATH="/usr/local/lib" BOOST="boost" BOOST_INC="/usr/local/boost" SHARED="OFF"
45+
- ACTION="ci/build_cmake.sh" VERSION="cpp03" ARCH="64" LIBPATH="/usr/local/lib" BOOST="" SHARED="OFF"
46+
- ACTION="ci/build_cmake.sh" VERSION="cpp03" ARCH="32" LIBPATH="/usr/local/lib32" BOOST="boost" BOOST_INC="/usr/local/boost" SHARED="OFF"
47+
- ACTION="ci/build_cmake.sh" VERSION="cpp03" ARCH="32" LIBPATH="/usr/local/lib32" BOOST="" SHARED="OFF"
48+
4449

4550
before_script:
4651
- export PATH=/usr/local/bin:$PATH

ci/build_cmake.sh

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,14 @@ else
4444
boost_dir=""
4545
fi
4646

47-
cmake $cpp11 $bit32 $boost $boost_dir ..
47+
if [ "$5" = "OFF" ]
48+
then
49+
shared="-DMSGPACK_ENABLE_SHARED=OFF"
50+
else
51+
shared=""
52+
fi
53+
54+
cmake $cpp11 $bit32 $boost $boost_dir $shared ..
4855

4956
ret=$?
5057
if [ $ret -ne 0 ]

0 commit comments

Comments
 (0)