diff options
| author | mayeut <mayeut@users.noreply.github.com> | 2015-10-10 18:58:26 +0200 |
|---|---|---|
| committer | mayeut <mayeut@users.noreply.github.com> | 2015-10-10 18:58:26 +0200 |
| commit | 99c4376aed52426c865d2382afdee56f304a1e37 (patch) | |
| tree | 0efaa24ffe34a173d4709ad8603378cd4dacd568 /tools | |
| parent | c3493063b9a497f0ba39acbf38b658d29615ba7c (diff) | |
kdb copy
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/ctest_scripts/travis-ci.cmake | 4 | ||||
| -rwxr-xr-x | tools/travis-ci/install.sh | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/tools/ctest_scripts/travis-ci.cmake b/tools/ctest_scripts/travis-ci.cmake index 53bfbf48..8dc94f57 100644 --- a/tools/ctest_scripts/travis-ci.cmake +++ b/tools/ctest_scripts/travis-ci.cmake @@ -16,9 +16,11 @@ endif() if("$ENV{TRAVIS_OS_NAME}" STREQUAL "windows") set( CTEST_CMAKE_GENERATOR "NMake Makefiles") set( CTEST_BUILD_COMMAND "nmake" ) + set( JPYLYZER_EXT "exe" ) else() set( CTEST_CMAKE_GENERATOR "Unix Makefiles") # Always makefile in travis-ci environment set( CCFLAGS_WARNING "-Wall -Wextra -Wconversion -Wno-unused-parameter -Wdeclaration-after-statement") + set( JPYLYZER_EXT "py" ) endif() if ("$ENV{OPJ_BUILD_CONFIGURATION}" STREQUAL "") @@ -104,7 +106,7 @@ BUILD_THIRDPARTY:BOOL=TRUE OPJ_DATA_ROOT:PATH=$ENV{PWD}/data # jpylyzer is available with on GitHub: https://github.com/openpreserve/jpylyzer -JPYLYZER_EXECUTABLE=$ENV{PWD}/jpylyzer/jpylyzer/jpylyzer.py +JPYLYZER_EXECUTABLE=$ENV{PWD}/jpylyzer/jpylyzer.${JPYLYZER_EXT} " ) diff --git a/tools/travis-ci/install.sh b/tools/travis-ci/install.sh index 4ab46698..8806ac60 100755 --- a/tools/travis-ci/install.sh +++ b/tools/travis-ci/install.sh @@ -64,7 +64,7 @@ if [ "${OPJ_CI_SKIP_TESTS:-}" != "1" ]; then OPJ_DATA_BRANCH=master #default to master fi echo "Cloning openjpeg-data from ${OPJ_DATA_BRANCH} branch" - git clone --depth=1 --branch=${OPJ_DATA_BRANCH} git://github.com/uclouvain/openjpeg-data.git data + #git clone --depth=1 --branch=${OPJ_DATA_BRANCH} git://github.com/uclouvain/openjpeg-data.git data # We need jpylyzer for the test suite echo "Retrieving jpylyzer" @@ -111,6 +111,7 @@ if [ "${OPJ_CI_SKIP_TESTS:-}" != "1" ]; then wget -q http://kakadusoftware.com/wp-content/uploads/2014/06/KDU77_Demo_Apps_for_Win32_150710.msi_.zip cmake -E tar -xf KDU77_Demo_Apps_for_Win32_150710.msi_.zip msiexec /i KDU77_Demo_Apps_for_Win32_150710.msi /quiet /qn /norestart + cp -r "C:/Program Files \(x86\)/Kakadu" ./kdu fi fi fi |