Merge branch 'MacBuild' into develop

cmake/bornagain/scripts/fix_apple_bundle.py

@@ -125,6 +125,7 @@ def fixDependency(filename, old, new):
     """
     Replaces old dependency with new one for given binary file
     """
+    print "    fixDependency(filename, old, new)", filename, old, new
     p = subprocess.Popen(['install_name_tool', '-change', old, new, filename], stdout=subprocess.PIPE)
     p.communicate()
     return
@@ -399,8 +400,9 @@ def fix_apple_bundle():
     print '-'*80
     print "Fixing OS X bundle at '{0}'".format(bundle_dir())
     print '-'*80
-    # copy_python_framework()
-    copy_qt_libraries()
+    # # copy_python_framework()
+    # FIXME provide automatic recognition of Qt dependency type (@rpath or hard coded)
+    # copy_qt_libraries() # this line should be uncommented for macport based builds
     copy_qt_plugins()
     copy_dependencies()
     validate_dependencies()

dev-tools/deployment/mavericks-dev/build_bornagain.sh

@@ -10,7 +10,7 @@ git clone -b develop git://apps.jcns.fz-juelich.de/BornAgain.git
 mkdir BornAgain-build
 cd BornAgain-build
 export ANACONDA=/Users/vagrant/anaconda2
-cmake -DPYTHON_LIBRARY=$ANACONDA/lib/libpython2.7.dylib -DPYTHON_EXECUTABLE=$ANACONDA/bin/python2.7 -DBORNAGAIN_APPLE_BUNDLE=ON -DCMAKE_PREFIX_PATH=/usr/local ../BornAgain
+cmake -DCMAKE_C_COMPILER=/usr/local/opt/llvm36/bin/clang-3.6 -DCMAKE_CXX_COMPILER=/usr/local/opt/llvm36/bin/clang++-3.6  -DPYTHON_LIBRARY=$ANACONDA/lib/libpython2.7.dylib -DPYTHON_EXECUTABLE=$ANACONDA/bin/python2.7 -DBORNAGAIN_APPLE_BUNDLE=ON -DCMAKE_PREFIX_PATH=/usr/local ../BornAgain
 make -j4
 cpack -V