Refs #10840. Python imports without errors.

mantidproject · Feb 9, 2015 · a9facf7 · a9facf7
1 parent 4ab5272
commit a9facf7
Show file tree

Hide file tree

Showing 13 changed files with 26 additions and 13 deletions.
diff --git a/Code/Mantid/Framework/Algorithms/CMakeLists.txt b/Code/Mantid/Framework/Algorithms/CMakeLists.txt
@@ -752,7 +752,8 @@ enable_precompiled_headers ( inc/MantidAlgorithms/PrecompiledHeader.h SRC_FILES
 # Add the target for this directory
 add_library ( Algorithms ${SRC_FILES} ${INC_FILES})
 # Set the name of the generated library
-set_target_properties ( Algorithms PROPERTIES OUTPUT_NAME MantidAlgorithms )
+set_target_properties ( Algorithms PROPERTIES OUTPUT_NAME MantidAlgorithms 
+                                              INSTALL_RPATH "@loader_path/../contents/MacOS/")
 # Add to the 'Framework' group in VS
 set_property ( TARGET Algorithms PROPERTY FOLDER "MantidFramework" )
 

diff --git a/Code/Mantid/Framework/Crystal/CMakeLists.txt b/Code/Mantid/Framework/Crystal/CMakeLists.txt
@@ -211,7 +211,8 @@ endif(UNITY_BUILD)
 # Add the target for this directory
 add_library ( Crystal ${SRC_FILES} ${INC_FILES})
 # Set the name of the generated library
-set_target_properties ( Crystal PROPERTIES OUTPUT_NAME MantidCrystal )
+set_target_properties ( Crystal PROPERTIES OUTPUT_NAME MantidCrystal 
+                                           INSTALL_RPATH "@loader_path/../contents/MacOS/")
 # Add to the 'Framework' group in VS
 set_property ( TARGET Crystal PROPERTY FOLDER "MantidFramework" )
 

diff --git a/Code/Mantid/Framework/CurveFitting/CMakeLists.txt b/Code/Mantid/Framework/CurveFitting/CMakeLists.txt
@@ -316,7 +316,9 @@ enable_precompiled_headers( inc/MantidCurveFitting/PrecompiledHeader.h SRC_FILES
 # Add the target for this directory
 add_library ( CurveFitting ${SRC_FILES} ${INC_FILES})
 # Set the name of the generated library
-set_target_properties ( CurveFitting PROPERTIES OUTPUT_NAME MantidCurveFitting COMPILE_DEFINITIONS IN_MANTID_CURVEFITTING)
+set_target_properties ( CurveFitting PROPERTIES OUTPUT_NAME MantidCurveFitting 
+                                     COMPILE_DEFINITIONS IN_MANTID_CURVEFITTING
+                                     INSTALL_RPATH "@loader_path/../contents/MacOS/")
 # Add to the 'Framework' group in VS
 set_property ( TARGET CurveFitting PROPERTY FOLDER "MantidFramework" )
 

diff --git a/Code/Mantid/Framework/DataHandling/CMakeLists.txt b/Code/Mantid/Framework/DataHandling/CMakeLists.txt
@@ -447,7 +447,8 @@ enable_precompiled_headers( inc/MantidDataHandling/PrecompiledHeader.h SRC_FILES
 # Add the target for this directory
 add_library ( DataHandling ${SRC_FILES} ${INC_FILES})
 # Set the name of the generated library
-set_target_properties ( DataHandling PROPERTIES OUTPUT_NAME MantidDataHandling )
+set_target_properties ( DataHandling PROPERTIES OUTPUT_NAME MantidDataHandling 
+                                                INSTALL_RPATH "@loader_path/../contents/MacOS/")
 # Add to the 'Framework' group in VS
 set_property ( TARGET DataHandling PROPERTY FOLDER "MantidFramework" )
 

diff --git a/Code/Mantid/Framework/ICat/CMakeLists.txt b/Code/Mantid/Framework/ICat/CMakeLists.txt
@@ -81,7 +81,8 @@ enable_precompiled_headers( inc/MantidICat/PrecompiledHeader.h SRC_FILES )
 add_library ( ICat ${SRC_FILES} ${INC_FILES})
 # Set the name of the generated library
 set_target_properties ( ICat PROPERTIES OUTPUT_NAME MantidICat 
-                                        COMPILE_DEFINITIONS IN_MANTID_ICAT )
+                                        COMPILE_DEFINITIONS IN_MANTID_ICAT 
+                                        INSTALL_RPATH "@loader_path/../contents/MacOS/")
 # Add to the 'Framework' group in VS
 set_property ( TARGET ICat PROPERTY FOLDER "MantidFramework" )
 

diff --git a/Code/Mantid/Framework/ISISLiveData/CMakeLists.txt b/Code/Mantid/Framework/ISISLiveData/CMakeLists.txt
@@ -19,7 +19,8 @@ set ( TEST_FILES
 add_library ( ISISLiveData ${SRC_FILES} ${INC_FILES})
 # Set the name of the generated library
 set_target_properties ( ISISLiveData PROPERTIES OUTPUT_NAME MantidISISLiveData 
-                                               COMPILE_DEFINITIONS IN_MANTID_ISISLIVEDATA )
+                                                COMPILE_DEFINITIONS IN_MANTID_ISISLIVEDATA 
+                                                INSTALL_RPATH "@loader_path/../contents/MacOS/")
 # Add to the 'Framework' group in VS
 set_property ( TARGET ISISLiveData PROPERTY FOLDER "MantidFramework" )
 

diff --git a/Code/Mantid/Framework/LiveData/CMakeLists.txt b/Code/Mantid/Framework/LiveData/CMakeLists.txt
@@ -61,7 +61,8 @@ enable_precompiled_headers( inc/MantidLiveData/PrecompiledHeader.h SRC_FILES )
 # Add the target for this directory
 add_library ( LiveData ${SRC_FILES} ${INC_FILES})
 # Set the name of the generated library
-set_target_properties ( LiveData PROPERTIES OUTPUT_NAME MantidLiveData )
+set_target_properties ( LiveData PROPERTIES OUTPUT_NAME MantidLiveData 
+                                            INSTALL_RPATH "@loader_path/../contents/MacOS/")
 # Add to the 'Framework' group in VS
 set_property ( TARGET LiveData PROPERTY FOLDER "MantidFramework" )
 

diff --git a/Code/Mantid/Framework/MDAlgorithms/CMakeLists.txt b/Code/Mantid/Framework/MDAlgorithms/CMakeLists.txt
@@ -256,7 +256,8 @@ enable_precompiled_headers( inc/MantidMDAlgorithms/PrecompiledHeader.h SRC_FILES
 add_library ( MDAlgorithms ${SRC_FILES} ${INC_FILES})
 # Set the name of the generated library
 set_target_properties ( MDAlgorithms PROPERTIES OUTPUT_NAME MantidMDAlgorithms 
-                                                COMPILE_DEFINITIONS IN_MANTID_MDALGORITHMS )
+                                                COMPILE_DEFINITIONS IN_MANTID_MDALGORITHMS 
+                                                INSTALL_RPATH "@loader_path/../contents/MacOS/")
 # Add to the 'Framework' group in VS
 set_property ( TARGET MDAlgorithms PROPERTY FOLDER "MantidFramework" )
 

diff --git a/Code/Mantid/Framework/PythonInterface/mantid/api/CMakeLists.txt b/Code/Mantid/Framework/PythonInterface/mantid/api/CMakeLists.txt
@@ -130,7 +130,7 @@ set_target_output_directory ( PythonAPIModule ${OUTPUT_DIR} .pyd )
 
 # Add the required dependencies
 target_link_libraries ( PythonAPIModule PythonGeometryModule PythonKernelModule API )
-set_target_properties( PythonAPIModule PROPERTIES INSTALL_RPATH "@loader_path/../../;@loader_path/../kernel/")
+set_target_properties( PythonAPIModule PROPERTIES INSTALL_RPATH "@loader_path/../../;@loader_path/../kernel/;@loader_path/../geometry/")
 ###########################################################################
 # Installation settings
 ###########################################################################

diff --git a/Code/Mantid/Framework/RemoteAlgorithms/CMakeLists.txt b/Code/Mantid/Framework/RemoteAlgorithms/CMakeLists.txt
@@ -38,7 +38,8 @@ set( INC_FILES
 add_library ( RemoteAlgorithms ${SRC_FILES} ${INC_FILES})
 
 # Set the name of the generated library
-set_target_properties ( RemoteAlgorithms PROPERTIES OUTPUT_NAME MantidRemoteAlgorithms )
+set_target_properties ( RemoteAlgorithms PROPERTIES OUTPUT_NAME MantidRemoteAlgorithms 
+                                                    INSTALL_RPATH "@loader_path/../contents/MacOS/")
 
 # Add to the 'Framework' group in VS
 set_property ( TARGET RemoteAlgorithms PROPERTY FOLDER "MantidFramework" )

diff --git a/Code/Mantid/Framework/SINQ/CMakeLists.txt b/Code/Mantid/Framework/SINQ/CMakeLists.txt
@@ -149,7 +149,8 @@ enable_precompiled_headers ( inc/MantidSINQ/PrecompiledHeader.h SRC_FILES )
 add_library ( SINQ ${SRC_FILES} ${INC_FILES} )
 # Set the name of the generated library
 set_target_properties ( SINQ PROPERTIES OUTPUT_NAME MantidSINQ 
-                                        COMPILE_DEFINITIONS "IN_MANTID_SINQ" )
+                                        COMPILE_DEFINITIONS "IN_MANTID_SINQ" 
+                                        INSTALL_RPATH "@loader_path/../contents/MacOS/")
 # Add to the 'Framework' group in VS
 set_property ( TARGET SINQ PROPERTY FOLDER "MantidFramework" )
 

diff --git a/Code/Mantid/Framework/ScriptRepository/CMakeLists.txt b/Code/Mantid/Framework/ScriptRepository/CMakeLists.txt
@@ -18,7 +18,8 @@ add_library ( ScriptRepository ${SRC_FILES} ${INC_FILES} )
 add_subdirectory ( test )
 # Set the name of the generated library
 set_target_properties ( ScriptRepository PROPERTIES OUTPUT_NAME MantidScriptRepository 
-                        COMPILE_DEFINITIONS IN_MANTID_SCRIPTREPO)
+                        COMPILE_DEFINITIONS IN_MANTID_SCRIPTREPO
+                        INSTALL_RPATH "@loader_path/../contents/MacOS/")
 
 set_property (TARGET ScriptRepository PROPERTY FOLDER "MantidFramework")
 

diff --git a/Code/Mantid/Framework/WorkflowAlgorithms/CMakeLists.txt b/Code/Mantid/Framework/WorkflowAlgorithms/CMakeLists.txt
@@ -98,7 +98,8 @@ enable_precompiled_headers( inc/MantidWorkflowAlgorithms/PrecompiledHeader.h SRC
 # Add the target for this directory
 add_library ( WorkflowAlgorithms ${SRC_FILES} ${INC_FILES})
 # Set the name of the generated library
-set_target_properties ( WorkflowAlgorithms PROPERTIES OUTPUT_NAME MantidWorkflowAlgorithms )
+set_target_properties ( WorkflowAlgorithms PROPERTIES OUTPUT_NAME MantidWorkflowAlgorithms 
+                                                      INSTALL_RPATH "@loader_path/../contents/MacOS/")
 # Add to the 'Framework' group in VS
 set_property ( TARGET WorkflowAlgorithms PROPERTY FOLDER "MantidFramework" )