diff options
| author | mayeut <mayeut@users.noreply.github.com> | 2015-10-10 18:15:28 +0200 |
|---|---|---|
| committer | mayeut <mayeut@users.noreply.github.com> | 2015-10-10 18:15:28 +0200 |
| commit | cc9bf1d5576a5180591fc11ffd3c37d20d08f4c2 (patch) | |
| tree | 225ef01beac5e0a2abd5ec73d133b67f1fb272fc /tools | |
| parent | a01f7cdee0a4c93fa5ccae7cb03dba7a1d5065ee (diff) | |
Use make under windows
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/ctest_scripts/travis-ci.cmake | 8 | ||||
| -rwxr-xr-x | tools/travis-ci/install.sh | 1 |
2 files changed, 8 insertions, 1 deletions
diff --git a/tools/ctest_scripts/travis-ci.cmake b/tools/ctest_scripts/travis-ci.cmake index a95b5a00..46aec09d 100644 --- a/tools/ctest_scripts/travis-ci.cmake +++ b/tools/ctest_scripts/travis-ci.cmake @@ -12,7 +12,13 @@ if($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{TRAVIS_OS_NAME}" STREQUAL "windows") + set( CTEST_CMAKE_GENERATOR "NMake Makefiles") + SET( CTEST_BUILD_COMMAND "nmake" ) +else() + set( CTEST_CMAKE_GENERATOR "Unix Makefiles") # Always makefile in travis-ci environment +endif() if ("$ENV{OPJ_BUILD_CONFIGURATION}" STREQUAL "") set( CTEST_BUILD_CONFIGURATION "Release") diff --git a/tools/travis-ci/install.sh b/tools/travis-ci/install.sh index 3b122434..4ab46698 100755 --- a/tools/travis-ci/install.sh +++ b/tools/travis-ci/install.sh @@ -107,6 +107,7 @@ if [ "${OPJ_CI_SKIP_TESTS:-}" != "1" ]; then install_name_tool -change /usr/local/lib/libkdu_v77R.dylib ${PWD}/libkdu_v77R.dylib kdu_compress install_name_tool -change /usr/local/lib/libkdu_v77R.dylib ${PWD}/libkdu_v77R.dylib kdu_expand elif [ "${APPVEYOR:-}" == "True" ]; then + echo "Retrieving Kakadu" 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 |