Skip to content

Commit

Permalink
Refs #4333. Try the path again...
Browse files Browse the repository at this point in the history
  • Loading branch information
martyngigg committed Jan 11, 2012
1 parent efc1d38 commit 831ed97
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions Code/Mantid/MantidPlot/FixBundle.cmake.in
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ endfunction()

# Additional steps so that the plugins that depend on plugins actually work
set ( mantid_bundle ${bundle}/Contents/MacOS/mantid )
set ( mantid_exec_path @executable_path/../../Contents/MacOS/mantid )
set ( mantid_exec_path @executable_path/../MacOS/mantid )
set ( macos_exec_path @executable_path/../../Contents/MacOS )

# First make sure the IDs is correct
Expand All @@ -44,13 +44,13 @@ change_bundle_id ( ${mantid_exec_path}/geometry/_geometry.so ${mantid_bundle}/ge
change_bundle_id ( ${mantid_exec_path}/api/_api.so ${mantid_bundle}/api/_api.so )

# _kernel dependency in _geometry
change_bundle_dep( ${macos_exec_path}/_kernel.so ${mantid_exec_path}/mantid/kernel/_kernel.so ${mantid_bundle}/geometry/_geometry.so )
change_bundle_dep( ${macos_exec_path}/_kernel.so ${mantid_exec_path}/kernel/_kernel.so ${mantid_bundle}/geometry/_geometry.so )

# _kernel dependency in _api
change_bundle_dep( ${macos_exec_path}/_kernel.so ${mantid_exec_path}/mantid/kernel/_kernel.so ${mantid_bundle}/api/_api.so )
change_bundle_dep( ${macos_exec_path}/_kernel.so ${mantid_exec_path}/kernel/_kernel.so ${mantid_bundle}/api/_api.so )

# _geometry dependency in _api
change_bundle_dep( ${macos_exec_path}/_geometry.so ${mantid_exec_path}/mantid/geometry/_geometry.so ${mantid_bundle}/api/_api.so )
change_bundle_dep( ${macos_exec_path}/_geometry.so ${mantid_exec_path}/geometry/_geometry.so ${mantid_bundle}/api/_api.so )



0 comments on commit 831ed97

Please sign in to comment.