From 54d0263adab2632bbc8bc74bcf8785fa4dc536e9 Mon Sep 17 00:00:00 2001
From: Samuel Jackson <samueljackson@outlook.com>
Date: Fri, 13 Jul 2018 16:00:56 +0100
Subject: [PATCH] Fix making a packge using homebrew LLVM
Previously if using the homebrew LLVM the correct paths were not found
for openMP and the std C++ library.
---
MantidPlot/make_package.rb.in | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/MantidPlot/make_package.rb.in b/MantidPlot/make_package.rb.in
index 141c681498d..03597810787 100755
--- a/MantidPlot/make_package.rb.in
+++ b/MantidPlot/make_package.rb.in
@@ -108,6 +108,10 @@ if(poco_version[0] > 1 || (poco_version[0] == 1 && poco_version[1] >= 6))
end
if("@OPENMP_FOUND@" == "TRUE")
+ if not File.file?("/usr/lib/libomp.dylib")
+ # assume we're using system llvm
+ library_filenames << "libc++.dylib"
+ end
library_filenames << "libomp.dylib"
end
@@ -119,6 +123,14 @@ library_filenames.each do |filename|
copyFile(openssl_dir+filename)
elsif filename.include? "libcrypto.dylib"
copyFile(openssl_dir+filename)
+ elsif filename.include? "libomp.dylib" or filename.include? "libc++.dylib"
+ if File.file?(lib_dir+"libomp.dylib")
+ # using system llvm
+ copyFile(lib_dir+filename)
+ elsif
+ # using homebrew llvm
+ copyFile("/usr/local/opt/llvm/lib/"+filename)
+ end
else
copyFile(lib_dir+filename)
end
--
GitLab