File tree Expand file tree Collapse file tree 3 files changed +3
-3
lines changed Expand file tree Collapse file tree 3 files changed +3
-3
lines changed Original file line number Diff line number Diff line change @@ -7,7 +7,7 @@ language: cpp
7
7
compiler :
8
8
- gcc
9
9
- clang
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
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 && make jsoncpp_check
11
11
env :
12
12
matrix :
13
13
- SHARED_LIB=ON STATIC_LIB=ON CMAKE_PKG=ON BUILD_TYPE=release VERBOSE_MAKE=false
Original file line number Diff line number Diff line change @@ -2,7 +2,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.5)
2
2
PROJECT (jsoncpp )
3
3
ENABLE_TESTING ()
4
4
5
- OPTION (JSONCPP_WITH_TESTS "Compile and run JsonCpp test executables" ON )
5
+ OPTION (JSONCPP_WITH_TESTS "Compile and (for jsoncpp_check) run JsonCpp test executables" ON )
6
6
OPTION (JSONCPP_WITH_POST_BUILD_UNITTEST "Automatically run unit-tests as a post build step" ON )
7
7
OPTION (JSONCPP_WITH_WARNING_AS_ERROR "Force compilation to fail if a warning occurs" OFF )
8
8
OPTION (JSONCPP_WITH_PKGCONFIG_SUPPORT "Generate and install .pc files" ON )
Original file line number Diff line number Diff line change @@ -20,7 +20,7 @@ IF(PYTHONINTERP_FOUND)
20
20
# Run end to end parser/writer tests
21
21
SET (TEST_DIR ${CMAKE_CURRENT_SOURCE_DIR} /../../test )
22
22
SET (RUNJSONTESTS_PATH ${TEST_DIR} /runjsontests.py )
23
- ADD_CUSTOM_TARGET (jsoncpp_readerwriter_tests ALL
23
+ ADD_CUSTOM_TARGET (jsoncpp_readerwriter_tests
24
24
"${PYTHON_EXECUTABLE} " -B "${RUNJSONTESTS_PATH} " $< TARGET_FILE:jsontestrunner_exe> "${TEST_DIR} /data"
25
25
DEPENDS jsontestrunner_exe jsoncpp_test
26
26
)
You can’t perform that action at this time.
0 commit comments