Skip to content

Commit ea2d167

Browse files
cdunn2001cdunn2001
committed
Merge pull request open-source-parsers#158 from cdunn2001/travis-with-cmake-package
JSONCPP_WITH_CMAKE_PACKAGE in Travis I guess we don't really need to shared and static separately either. Saves a little time, maybe?
2 parents 2941cb3 + 41edda5 commit ea2d167

1 file changed

Lines changed: 3 additions & 4 deletions

File tree

‎.travis.yml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,11 @@ language: cpp
77
compiler:
88
- gcc
99
- clang
10-
script: cmake -DJSONCPP_LIB_BUILD_SHARED=$SHARED_LIBRARY -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_VERBOSE_MAKEFILE=$VERBOSE_MAKE . && make
10+
script: cmake -DJSONCPP_WITH_CMAKE_PACKAGE=$CMAKE_PKG -DJSONCPP_LIB_BUILD_SHARED=$SHARED_LIB -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_VERBOSE_MAKEFILE=$VERBOSE_MAKE . && make
1111
env:
1212
matrix:
13-
- SHARED_LIBRARY=ON BUILD_TYPE=release VERBOSE_MAKE=false
14-
- SHARED_LIBRARY=OFF BUILD_TYPE=release VERBOSE_MAKE=false
15-
- SHARED_LIBRARY=OFF BUILD_TYPE=debug VERBOSE VERBOSE_MAKE=true
13+
- SHARED_LIB=ON STATIC_LIB=ON CMAKE_PKG=ON BUILD_TYPE=release VERBOSE_MAKE=false
14+
- SHARED_LIB=OFF STATIC_LIB=ON CMAKE_PKG=OFF BUILD_TYPE=debug VERBOSE_MAKE=true VERBOSE
1615
notifications:
1716
email:
1817
- aaronjjacobs@gmail.com

0 commit comments

Comments
 (0)