Fixed rpath for the Qt libraries on mac.

GUI/main/CMakeLists.txt

@@ -78,7 +78,7 @@ if(APPLE)
     if(BORNAGAIN_APPLE_BUNDLE)
         # this makes sense only if we build a bundle
         set(link_flags "-Wl,-rpath,@loader_path/../Frameworks/ \
-  -Wl,-rpath,@loader_path/../../../lib/BornAgain-${BornAgain_VERSION_MAJOR}.${BornAgain_VERSION_MINOR}/")
+  -Wl,-rpath,@loader_path/../lib/BornAgain-${BornAgain_VERSION_MAJOR}.${BornAgain_VERSION_MINOR}/")
     else()
         set(link_flags "-Wl,-rpath,@loader_path/../../../lib/BornAgain-${BornAgain_VERSION_MAJOR}.${BornAgain_VERSION_MINOR}/")
     endif()
@@ -113,10 +113,10 @@ if(UNIX)
         install( FILES ${CMAKE_SOURCE_DIR}/GUI/main/BornAgain.icns
             DESTINATION ${destination_bundle}/Contents/Resources/
         )
-        install( FILES ${CMAKE_SOURCE_DIR}/cmake/scripts/qt.conf
+        install( FILES ${CMAKE_SOURCE_DIR}/cmake/bornagain/scripts/qt.conf
             DESTINATION ${destination_bundle}/Contents/Resources/
         )
-        configure_file(${CMAKE_SOURCE_DIR}/cmake/modules/FixAppleBundle.cmake.in
+        configure_file(${CMAKE_SOURCE_DIR}/cmake/bornagain/modules/FixAppleBundle.cmake.in
                        ${BUILD_VAR_DIR}/FixAppleBundle.cmake @ONLY)
         install(SCRIPT ${BUILD_VAR_DIR}/FixAppleBundle.cmake COMPONENT Runtime)
 

cmake/bornagain/modules/BornAgainConfiguration.cmake

@@ -94,6 +94,11 @@ else()
         set(destination_prefix ${destination_bundle}/Contents/)
         set(destination_libexec ${destination_prefix}libexec/${destination_suffix})
     else()
+        if(APPLE)
+            set(QTDIR $ENV{QTDIR})
+            message(STATUS "QTDIR is ${QTDIR}")
+            set(CMAKE_INSTALL_RPATH ${QTDIR}/lib)
+        endif()
         set(destination_prefix "")
         set(destination_libexec ${destination_prefix}lib/${destination_suffix})
     endif()

cmake/bornagain/modules/FixAppleBundle.cmake.in

@@ -3,4 +3,4 @@
 ###############################################################################
 
 set(bundle ${CMAKE_INSTALL_PREFIX}/BornAgain.app )
-execute_process(COMMAND @PYTHON_EXECUTABLE@ @CMAKE_SOURCE_DIR@/cmake/scripts/fix_apple_bundle.py ${bundle})
+execute_process(COMMAND @PYTHON_EXECUTABLE@ @CMAKE_SOURCE_DIR@/cmake/bornagain/scripts/fix_apple_bundle.py ${bundle})