Skip to content
Snippets Groups Projects
Unverified Commit d671dd5b authored by Martyn Gigg's avatar Martyn Gigg Committed by GitHub
Browse files

Merge pull request #22926 from samueljackson92/fix-make-package-osx-llvm

Fix making a package using homebrew LLVM
parents 88d82785 54d0263a
No related branches found
No related tags found
No related merge requests found
...@@ -108,6 +108,10 @@ if(poco_version[0] > 1 || (poco_version[0] == 1 && poco_version[1] >= 6)) ...@@ -108,6 +108,10 @@ if(poco_version[0] > 1 || (poco_version[0] == 1 && poco_version[1] >= 6))
end end
if("@OPENMP_FOUND@" == "TRUE") 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" library_filenames << "libomp.dylib"
end end
...@@ -119,6 +123,14 @@ library_filenames.each do |filename| ...@@ -119,6 +123,14 @@ library_filenames.each do |filename|
copyFile(openssl_dir+filename) copyFile(openssl_dir+filename)
elsif filename.include? "libcrypto.dylib" elsif filename.include? "libcrypto.dylib"
copyFile(openssl_dir+filename) 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 else
copyFile(lib_dir+filename) copyFile(lib_dir+filename)
end end
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment