From 801d602e06d852de47b134f08715a3333fd85b12 Mon Sep 17 00:00:00 2001 From: jredmondson Date: Thu, 14 Sep 2023 21:50:33 -0700 Subject: [PATCH] * Added message to LD_LIBRARY_PATH output in base_build.sh to help determine when cmake and mac are being used or not --- scripts/linux/base_build.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/linux/base_build.sh b/scripts/linux/base_build.sh index 97e120ca8..85c60e013 100755 --- a/scripts/linux/base_build.sh +++ b/scripts/linux/base_build.sh @@ -2294,6 +2294,8 @@ if [ $ANDROID -eq 1 ]; then fi +ECHO "EXPORTING ENVIRONMENT: CMAKE=$CMAKE, MAC=$MAC" + if [ $CMAKE -eq 1 ]; then if [ $MAC -eq 0 ]; then @@ -2323,12 +2325,14 @@ if [ $CMAKE -eq 1 ]; then else # not CMAKE if [ $MAC -eq 0 ]; then + echo "Configuring non-mac non-cmake..." if grep -q LD_LIBRARY_PATH $HOME/.gams/env.sh ; then sed -i 's@LD_LIBRARY_PATH=.*@LD_LIBRARY_PATH='"\$LD_LIBRARY_PATH"':'"\$MADARA_ROOT/lib"':'"\$GAMS_ROOT/lib"':'"\$VREP_ROOT"':'"\$CAPNP_ROOT/c++/.libs:\$SCRIMMAGE_GIT_ROOT/build/plugin_libs:\$SCRIMMAGE_GIT_ROOT/build/lib"'@' $HOME/.gams/env.sh else echo "export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:\$MADARA_ROOT/lib:\$GAMS_ROOT/lib:\$VREP_ROOT:\$CAPNP_ROOT/c++/.libs:\$SCRIMMAGE_GIT_ROOT/build/plugin_libs:\$SCRIMMAGE_GIT_ROOT/build/lib" >> $HOME/.gams/env.sh fi else + echo "Configuring mac non-cmake..." if grep -q DYLD_LIBRARY_PATH $HOME/.gams/env.sh ; then sed -i 's@DYLD_LIBRARY_PATH=.*@DYLD_LIBRARY_PATH='"\$DYLD_LIBRARY_PATH"':'"\$MADARA_ROOT/lib"':'"\$GAMS_ROOT/lib"':'"\$VREP_ROOT"':'"\$CAPNP_ROOT/c++/.libs"'@' $HOME/.gams/env.sh else