From 272ab3fd1ad126169d9cc4d0158d77353ad35f1a Mon Sep 17 00:00:00 2001 From: Robin Mills Date: Thu, 10 Dec 2015 21:34:40 +0000 Subject: [PATCH] #1041 Fixes to jenkins_daily.sh for macosx and linux. Disabled cygwin on Jenkins to avoid the Windows10/cygwin/fork crash. --- jenkins_daily.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jenkins_daily.sh b/jenkins_daily.sh index a59e7b16..e163fe17 100755 --- a/jenkins_daily.sh +++ b/jenkins_daily.sh @@ -51,7 +51,7 @@ if [ "$PLATFORM" == "msvc" ]; then ) else pushd $build - cmake -DCMAKE_INSTALL_PREFIX=$dist $exiv2 + cmake -DCMAKE_INSTALL_PREFIX=$dist -DEXIV2_ENABLE_NLS=OFF $exiv2 make cmake --build . --target install popd @@ -91,7 +91,7 @@ if [ -e $dist/$bin/exiv2$exe ]; then ## # store the build for users to collect mmHD="" - if [ $PLATFORM == "linux" ]; then mmHD=/media/psf/mmHD ; fi + if [ $PLATFORM == "linux" ]; then mmHD=/media/psf/Host ; fi if [ $PLATFORM == "msvc" -o $PLATFORM == 'cygwin' ]; then mmHD="/cygdrive/z" fi