diff options
| author | mayeut <mayeut@users.noreply.github.com> | 2015-10-10 17:25:50 +0200 |
|---|---|---|
| committer | mayeut <mayeut@users.noreply.github.com> | 2015-10-10 17:25:50 +0200 |
| commit | f33f50126cafd95febf7e02fb03a0f55939ba893 (patch) | |
| tree | b86f92ec11c312b41ad97a1f430e8b5f5702f845 | |
| parent | 8d2019ae73ea646fda7ca91a6a93d88edaee4490 (diff) | |
Add OPJ_BINARY_DIR
| -rw-r--r-- | tools/ctest_scripts/travis-ci.cmake | 6 | ||||
| -rwxr-xr-x | tools/travis-ci/run.sh | 3 |
2 files changed, 7 insertions, 2 deletions
diff --git a/tools/ctest_scripts/travis-ci.cmake b/tools/ctest_scripts/travis-ci.cmake index 6d50b3f5..2d96399d 100644 --- a/tools/ctest_scripts/travis-ci.cmake +++ b/tools/ctest_scripts/travis-ci.cmake @@ -7,7 +7,11 @@ cmake_minimum_required(VERSION 2.8) set( ENV{LANG} en_US.UTF-8) -set( CTEST_DASHBOARD_ROOT "$ENV{PWD}/build" ) +if($ENV{OPJ_BINARY_DIR}) + set( CTEST_DASHBOARD_ROOT "$ENV{OPJ_BINARY_DIR}" ) +else + set( CTEST_DASHBOARD_ROOT "$ENV{PWD}/build" ) +endif() set( CTEST_CMAKE_GENERATOR "Unix Makefiles") # Always makefile in travis-ci environment if ("$ENV{OPJ_BUILD_CONFIGURATION}" STREQUAL "") diff --git a/tools/travis-ci/run.sh b/tools/travis-ci/run.sh index d04d74f9..8b0db273 100755 --- a/tools/travis-ci/run.sh +++ b/tools/travis-ci/run.sh @@ -159,13 +159,14 @@ cmake --version export OPJ_SITE=${OPJ_SITE} export OPJ_BUILDNAME=${OPJ_BUILDNAME} export OPJ_SOURCE_DIR=$(opjpath -m ${OPJ_SOURCE_DIR}) +export OPJ_BINARY_DIR=$(opjpath -m ${PWD}/build) export OPJ_BUILD_CONFIGURATION=${OPJ_CI_BUILD_CONFIGURATION} export OPJ_DO_SUBMIT=${OPJ_DO_SUBMIT} ctest -S ${OPJ_SOURCE_DIR}/tools/ctest_scripts/travis-ci.cmake -V || true # ctest will exit with various error codes depending on version. # ignore ctest exit code & parse this ourselves -set +x +#set +x # let's parse configure/build/tests for failure |