From 5b67c5aab572fbac16c14f9adc3f414a78c152c5 Mon Sep 17 00:00:00 2001
From: mnaveau <maximilien.naveau@laas.fr>
Date: Thu, 19 May 2016 18:25:15 +0200
Subject: [PATCH] Set the environnemt variables earlier in the script
---
travis_custom/custom_before_install | 6 ++++++
travis_custom/custom_build | 6 ------
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/travis_custom/custom_before_install b/travis_custom/custom_before_install
index b1f5ffd7..42945da2 100755
--- a/travis_custom/custom_before_install
+++ b/travis_custom/custom_before_install
@@ -36,6 +36,12 @@ export CMAKE_ADDITIONAL_OPTIONS=$CMAKE_ADDITIONAL_OPTIONS" -DLINEAR_ALGEBRA_LIB=
export CMAKE_ADDITIONAL_OPTIONS=$CMAKE_ADDITIONAL_OPTIONS" -DBUILD_UNIT_TESTS=OFF"
export CMAKE_ADDITIONAL_OPTIONS=$CMAKE_ADDITIONAL_OPTIONS" -DBUILD_PYTHON_INTERFACE=OFF"
+export PKG_CONFIG_PATH="${PKG_CONFIG_PATH}:/opt/openrobots/lib/pkgconfig"
+export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:/opt/openrobots/lib"
+
+export PKG_CONFIG_PATH="${PKG_CONFIG_PATH}:/opt/ros/hydro/lib/pkgconfig"
+export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:/opt/ros/hydro/lib"
+
# When this script is called the current directory is ./custom_travis
. ./.travis/run ../.travis/before_install
diff --git a/travis_custom/custom_build b/travis_custom/custom_build
index 502c3dd9..cadc6500 100755
--- a/travis_custom/custom_build
+++ b/travis_custom/custom_build
@@ -8,12 +8,6 @@ set -v
# Setup environment variables.
export CMAKE_ADDITIONAL_OPTIONS=" ${CMAKE_ADDITIONAL_OPTIONS} -DBUILD_UNIT_TESTS=\"ON\""
-export PKG_CONFIG_PATH="${PKG_CONFIG_PATH}:/opt/openrobots/lib/pkgconfig"
-export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:/opt/openrobots/lib"
-
-export PKG_CONFIG_PATH="${PKG_CONFIG_PATH}:/opt/ros/hydro/lib/pkgconfig"
-export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:/opt/ros/hydro/lib"
-
# Setup environment variables.
. ./.travis/run ../.travis/build
--
GitLab