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

Use make under windows

This commit is contained in:
mayeut 2015-10-10 18:15:28 +02:00
parent a01f7cdee0
commit cc9bf1d557
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,7 +12,13 @@ if($ENV{OPJ_BINARY_DIR})
else() else()
set( CTEST_DASHBOARD_ROOT "$ENV{PWD}/build" ) set( CTEST_DASHBOARD_ROOT "$ENV{PWD}/build" )
endif() 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 "") if ("$ENV{OPJ_BUILD_CONFIGURATION}" STREQUAL "")
set( CTEST_BUILD_CONFIGURATION "Release") set( CTEST_BUILD_CONFIGURATION "Release")

1
tools/travis-ci/install.sh
View File

@ -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_compress
install_name_tool -change /usr/local/lib/libkdu_v77R.dylib ${PWD}/libkdu_v77R.dylib kdu_expand install_name_tool -change /usr/local/lib/libkdu_v77R.dylib ${PWD}/libkdu_v77R.dylib kdu_expand
elif [ "${APPVEYOR:-}" == "True" ]; then 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 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 cmake -E tar -xf KDU77_Demo_Apps_for_Win32_150710.msi_.zip
msiexec /i KDU77_Demo_Apps_for_Win32_150710.msi /quiet /qn /norestart msiexec /i KDU77_Demo_Apps_for_Win32_150710.msi /quiet /qn /norestart