From 159623120fcdc891942813377bbbefdfd4de2963 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sat, 11 Jan 2014 13:25:10 +0100 Subject: [PATCH] package: adapted to Corrade Jenkins CI changes. Namely using deprecated/non-deprecated Corrade build. --- package/ci/jenkins-mingw32.xml | 2 +- package/ci/jenkins.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/ci/jenkins-mingw32.xml b/package/ci/jenkins-mingw32.xml index 81c54c69d..343df8bf8 100644 --- a/package/ci/jenkins-mingw32.xml +++ b/package/ci/jenkins-mingw32.xml @@ -77,7 +77,7 @@ cd build-mingw32-${libraries}-${compatibility} cmake .. \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_TOOLCHAIN_FILE=../toolchains/archlinux/basic-mingw32.cmake \ - -DCMAKE_FIND_ROOT_PATH=${JENKINS_HOME}/filesystem/mingw32-${libraries} \ + -DCMAKE_FIND_ROOT_PATH=${JENKINS_HOME}/filesystem/mingw32-${libraries}-${compatibility} \ -DCMAKE_INSTALL_PREFIX=${JENKINS_HOME}/filesystem/mingw32-${libraries}-${compatibility} \ -DBUILD_TESTS=ON \ -DBUILD_DEPRECATED=${deprecated_build_flag} \ diff --git a/package/ci/jenkins.xml b/package/ci/jenkins.xml index fb03d00dc..d3f3307a7 100644 --- a/package/ci/jenkins.xml +++ b/package/ci/jenkins.xml @@ -121,9 +121,9 @@ cd build-${compiler}-${libraries}-${compatibility}-${gl} cmake .. \ -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_FIND_ROOT_PATH=${JENKINS_HOME}/filesystem/${compiler}-${libraries} \ + -DCMAKE_FIND_ROOT_PATH=${JENKINS_HOME}/filesystem/${compiler}-${libraries}-${compatibility} \ -DCMAKE_INSTALL_PREFIX=${JENKINS_HOME}/filesystem/${compiler}-${libraries}-${compatibility}-${gl} \ - -DCMAKE_INSTALL_RPATH="${JENKINS_HOME}/filesystem/${compiler}-${libraries}/lib;${JENKINS_HOME}/filesystem/${compiler}-${libraries}-${compatibility}-${gl}/lib" \ + -DCMAKE_INSTALL_RPATH="${JENKINS_HOME}/filesystem/${compiler}-${libraries}-${compatibility}/lib;${JENKINS_HOME}/filesystem/${compiler}-${libraries}-${compatibility}-${gl}/lib" \ -DCMAKE_CXX_COMPILER=${compiler_binary} \ "${compiler_flags[@]}" \ -DBUILD_TESTS=ON \