This commit is contained in:
mayeut 2015-10-10 18:19:09 +02:00
parent cc9bf1d557
commit f0a980ec16
2 changed files with 2 additions and 2 deletions

View File

@ -15,7 +15,7 @@ endif()
if("$ENV{TRAVIS_OS_NAME}" STREQUAL "windows") if("$ENV{TRAVIS_OS_NAME}" STREQUAL "windows")
set( CTEST_CMAKE_GENERATOR "NMake Makefiles") set( CTEST_CMAKE_GENERATOR "NMake Makefiles")
SET( CTEST_BUILD_COMMAND "nmake" ) set( CTEST_BUILD_COMMAND "nmake" )
else() else()
set( CTEST_CMAKE_GENERATOR "Unix Makefiles") # Always makefile in travis-ci environment set( CTEST_CMAKE_GENERATOR "Unix Makefiles") # Always makefile in travis-ci environment
endif() endif()

View File

@ -163,7 +163,7 @@ export OPJ_BINARY_DIR=$(opjpath -m ${PWD}/build)
export OPJ_BUILD_CONFIGURATION=${OPJ_CI_BUILD_CONFIGURATION} export OPJ_BUILD_CONFIGURATION=${OPJ_CI_BUILD_CONFIGURATION}
export OPJ_DO_SUBMIT=${OPJ_DO_SUBMIT} export OPJ_DO_SUBMIT=${OPJ_DO_SUBMIT}
ctest -S ${OPJ_SOURCE_DIR}/tools/ctest_scripts/travis-ci.cmake -V || true ctest -S ${OPJ_SOURCE_DIR}/tools/ctest_scripts/travis-ci.cmake -VV || true
# ctest will exit with various error codes depending on version. # ctest will exit with various error codes depending on version.
# ignore ctest exit code & parse this ourselves # ignore ctest exit code & parse this ourselves
#set +x #set +x