Browse Source

package: adapted to Corrade Jenkins CI changes.

Namely using deprecated/non-deprecated Corrade build.
pull/51/head
Vladimír Vondruš 12 years ago
parent
commit
159623120f
  1. 2
      package/ci/jenkins-mingw32.xml
  2. 4
      package/ci/jenkins.xml

2
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} \

4
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 \

Loading…
Cancel
Save