Add OPJ_BINARY_DIR

diff --git a/tools/ctest_scripts/travis-ci.cmake b/tools/ctest_scripts/travis-ci.cmake
index 6d50b3f5757110096ef1ff3c778b4911bfd5b373..2d96399d18d65ad79b8489859f92f22f89efa3f5 100644 (file)
--- 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 d04d74f9ec8bb607b527aa344653522fb4146e19..8b0db2734351abc7c8ab8e5de9d93bc9e1fcd93b 100755 (executable)
--- 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