projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ba66249
)
Fall back to $PATH when searching for dcpomatic2_openssl.
author
Carl Hetherington
<cth@carlh.net>
Thu, 4 Jun 2020 18:47:36 +0000
(20:47 +0200)
committer
Carl Hetherington
<cth@carlh.net>
Thu, 4 Jun 2020 18:47:45 +0000
(20:47 +0200)
src/lib/cross_linux.cc
patch
|
blob
|
history
diff --git
a/src/lib/cross_linux.cc
b/src/lib/cross_linux.cc
index 7b807a44120ac10d62fc249896ac6fd894eb69bd..87806b1e60d9038598e4832eb79767a6cead44f2 100644
(file)
--- a/
src/lib/cross_linux.cc
+++ b/
src/lib/cross_linux.cc
@@
-157,7
+157,12
@@
directory_containing_executable ()
boost::filesystem::path
openssl_path ()
{
- return directory_containing_executable() / "dcpomatic2_openssl";
+ boost::filesystem::path p = directory_containing_executable() / "dcpomatic2_openssl";
+ if (boost::filesystem::is_regular_file(p)) {
+ return p;
+ }
+
+ return "dcpomatic2_openssl";
}