Merge commit 'ce1141982b4f7acf581d62a379f8fb49ac63f6b8' into mason07
This commit is contained in:
@@ -5,10 +5,10 @@ HERE="$( cd "$( dirname "${BASH_SOURCE[0]}" )" > /dev/null && pwd )"
|
||||
|
||||
# key properties unique to this library
|
||||
THIS_DIR=$(basename $(dirname $HERE))
|
||||
# Note: cannot duduce from directory since it is named in a custom way
|
||||
# Note: cannot deduce from directory since it is named in a custom way
|
||||
#BOOST_LIBRARY=${THIS_DIR#boost_lib}
|
||||
BOOST_LIBRARY=regex
|
||||
MASON_NAME=boost_lib${BOOST_LIBRARY}
|
||||
MASON_NAME=boost_lib${BOOST_LIBRARY}_icu
|
||||
MASON_LIB_FILE=lib/libboost_${BOOST_LIBRARY}.a
|
||||
# hack for inconsistently named test lib
|
||||
if [[ ${MASON_LIB_FILE} == "lib/libboost_test.a" ]]; then
|
||||
|
||||
@@ -5,10 +5,10 @@ HERE="$( cd "$( dirname "${BASH_SOURCE[0]}" )" > /dev/null && pwd )"
|
||||
|
||||
# key properties unique to this library
|
||||
THIS_DIR=$(basename $(dirname $HERE))
|
||||
# Note: cannot duduce from directory since it is named in a custom way
|
||||
# Note: cannot deduce from directory since it is named in a custom way
|
||||
#BOOST_LIBRARY=${THIS_DIR#boost_lib}
|
||||
BOOST_LIBRARY=regex
|
||||
MASON_NAME=boost_lib${BOOST_LIBRARY}
|
||||
MASON_NAME=boost_lib${BOOST_LIBRARY}_icu
|
||||
MASON_LIB_FILE=lib/libboost_${BOOST_LIBRARY}.a
|
||||
# hack for inconsistently named test lib
|
||||
if [[ ${MASON_LIB_FILE} == "lib/libboost_test.a" ]]; then
|
||||
|
||||
@@ -5,10 +5,10 @@ HERE="$( cd "$( dirname "${BASH_SOURCE[0]}" )" > /dev/null && pwd )"
|
||||
|
||||
# key properties unique to this library
|
||||
THIS_DIR=$(basename $(dirname $HERE))
|
||||
# Note: cannot duduce from directory since it is named in a custom way
|
||||
# Note: cannot deduce from directory since it is named in a custom way
|
||||
#BOOST_LIBRARY=${THIS_DIR#boost_lib}
|
||||
BOOST_LIBRARY=regex
|
||||
MASON_NAME=boost_lib${BOOST_LIBRARY}
|
||||
MASON_NAME=boost_lib${BOOST_LIBRARY}_icu
|
||||
MASON_LIB_FILE=lib/libboost_${BOOST_LIBRARY}.a
|
||||
# hack for inconsistently named test lib
|
||||
if [[ ${MASON_LIB_FILE} == "lib/libboost_test.a" ]]; then
|
||||
|
||||
Reference in New Issue
Block a user