Mac Build update build to 2013-09 versions

README.md
   reflect change in setenv_mac*.sh files
macosx-build-dependencies.sh
    qt4 version updated to 4.8.5 and is now at a different host which uses 302 redirection
FindBoost.cmake
    Added paths for MacPorts (/opt/local) and Brew (/usr/local) to previous Fink (/sw/local)
issue480
David M. Palmer 2013-09-05 21:50:19 -06:00
parent 7db45a878b
commit 31cb13b7ae
3 changed files with 6 additions and 3 deletions

View File

@ -119,8 +119,9 @@ Prerequisites:
Then after you've cloned this git repository, run the script that sets up the
environment variables.
source setenv_mjau.sh
source setenv_mac-gcc.sh
(or setenv_mac-clang.sh if you want to use the clang compiler instead of gcc).
Then run the script to compile all the prerequisite libraries above:
./scripts/macosx-build-dependencies.sh

View File

@ -51,7 +51,7 @@ build_qt()
cd $BASEDIR/src
rm -rf qt-everywhere-opensource-src-$version
if [ ! -f qt-everywhere-opensource-src-$version.tar.gz ]; then
curl -O http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-$version.tar.gz
curl -O -L http://download.qt-project.org/official_releases/qt/4.8/4.8.5/qt-everywhere-opensource-src-4.8.5.tar.gz
fi
tar xzf qt-everywhere-opensource-src-$version.tar.gz
cd qt-everywhere-opensource-src-$version
@ -435,7 +435,7 @@ fi
echo "Using basedir:" $BASEDIR
mkdir -p $SRCDIR $DEPLOYDIR
build_qt 4.8.4
build_qt 4.8.5
# NB! For eigen, also update the path in the function
build_eigen 3.1.3
build_gmp 5.1.2

View File

@ -887,6 +887,8 @@ else(_boost_IN_CACHE)
"$ENV{ProgramFiles}/boost/lib"
"$ENV{ProgramFiles}/boost"
/sw/local/lib
/opt/local/lib
/usr/local/lib
)
set(_boost_LIBRARY_SEARCH_DIRS ${_boost_LIBRARY_SEARCH_DIRS_ALWAYS})
if( Boost_NO_SYSTEM_PATHS )