Use make under windows

diff --git a/tools/ctest_scripts/travis-ci.cmake b/tools/ctest_scripts/travis-ci.cmake
index a95b5a0009ec8a81e144f4397d9d2a93bdad80ef..46aec09d4378b3c09e995ce2aec8f1ce5bfac506 100644 (file)
--- 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 3b122434f5a1f3ef21f26c3aeb8d77645932a37a..4ab4669888836763a69a80eb4778a738bb0c6c56 100755 (executable)
--- 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