From e389f6105759f386dfff392c5916502e8916e288 Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Sat, 9 Jan 2016 16:36:29 +0100 Subject: [PATCH 1/2] Add JPIP options to Travis configuration This fixes issue #691. Signed-off-by: Stefan Weil --- tools/ctest_scripts/travis-ci.cmake | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tools/ctest_scripts/travis-ci.cmake b/tools/ctest_scripts/travis-ci.cmake index f8c50e5b..fff628b0 100644 --- a/tools/ctest_scripts/travis-ci.cmake +++ b/tools/ctest_scripts/travis-ci.cmake @@ -103,6 +103,12 @@ CMAKE_C_FLAGS:STRING= ${CCFLAGS_ARCH} ${CCFLAGS_WARNING} # Use to activate the test suite BUILD_TESTING:BOOL=${BUILD_TESTING} +# Build the JPIP library and utilities +BUILD_JPIP:BOOL=TRUE + +# Build the JPIP server +BUILD_JPIP_SERVER:BOOL=TRUE + # Build Thirdparty, useful but not required for test suite BUILD_THIRDPARTY:BOOL=TRUE From b326c2ffb1aa3b8292fd5af4533b058c940cf686 Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Sat, 9 Jan 2016 17:20:57 +0100 Subject: [PATCH 2/2] Remove JPIP server from Travis configuration It has build dependencies which are missing on the Travis server. Signed-off-by: Stefan Weil --- tools/ctest_scripts/travis-ci.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/ctest_scripts/travis-ci.cmake b/tools/ctest_scripts/travis-ci.cmake index fff628b0..f757aae2 100644 --- a/tools/ctest_scripts/travis-ci.cmake +++ b/tools/ctest_scripts/travis-ci.cmake @@ -106,8 +106,8 @@ BUILD_TESTING:BOOL=${BUILD_TESTING} # Build the JPIP library and utilities BUILD_JPIP:BOOL=TRUE -# Build the JPIP server -BUILD_JPIP_SERVER:BOOL=TRUE +# Build the JPIP server (disabled because of missing build dependencies) +#BUILD_JPIP_SERVER:BOOL=TRUE # Build Thirdparty, useful but not required for test suite BUILD_THIRDPARTY:BOOL=TRUE