walkero
/
openjpeg
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Add OPJ_BINARY_DIR

This commit is contained in:
mayeut 2015-10-10 17:25:50 +02:00
parent 8d2019ae73
commit f33f50126c
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/ctest_scripts/travis-ci.cmake
View File

@ -7,7 +7,11 @@
cmake_minimum_required(VERSION 2.8) cmake_minimum_required(VERSION 2.8)
set( ENV{LANG} en_US.UTF-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 set( CTEST_CMAKE_GENERATOR "Unix Makefiles") # Always makefile in travis-ci environment
if ("$ENV{OPJ_BUILD_CONFIGURATION}" STREQUAL "") if ("$ENV{OPJ_BUILD_CONFIGURATION}" STREQUAL "")

3
tools/travis-ci/run.sh
View File

@ -159,13 +159,14 @@ cmake --version
export OPJ_SITE=${OPJ_SITE} export OPJ_SITE=${OPJ_SITE}
export OPJ_BUILDNAME=${OPJ_BUILDNAME} export OPJ_BUILDNAME=${OPJ_BUILDNAME}
export OPJ_SOURCE_DIR=$(opjpath -m ${OPJ_SOURCE_DIR}) 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_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 -V || 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
# let's parse configure/build/tests for failure # let's parse configure/build/tests for failure