diff options
| author | selsta <selsta@sent.at> | 2020-06-25 19:52:10 +0200 |
|---|---|---|
| committer | selsta <selsta@sent.at> | 2020-06-25 20:31:16 +0200 |
| commit | 6111689cfa256e1b10ad9213290999f183bfb63d (patch) | |
| tree | 9f19bb58cb312c80fb2c242dc449513b343bf342 | |
| parent | Merge pull request #6656 (diff) | |
| download | monero-6111689cfa256e1b10ad9213290999f183bfb63d.tar.xz | |
cmake: allow custom openssl path on macOS
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | contrib/depends/toolchain.cmake.in | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 45a6aa1b5..391afd2b0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -426,7 +426,7 @@ endif () if (APPLE AND NOT IOS) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=x86-64 -fvisibility=default -std=c++11") - if (NOT OpenSSL_DIR) + if (NOT OPENSSL_ROOT_DIR) EXECUTE_PROCESS(COMMAND brew --prefix openssl OUTPUT_VARIABLE OPENSSL_ROOT_DIR OUTPUT_STRIP_TRAILING_WHITESPACE) diff --git a/contrib/depends/toolchain.cmake.in b/contrib/depends/toolchain.cmake.in index 2634423ab..104e849f1 100644 --- a/contrib/depends/toolchain.cmake.in +++ b/contrib/depends/toolchain.cmake.in @@ -55,7 +55,7 @@ SET(Boost_NO_SYSTEM_PATHS ON) SET(Boost_USE_STATIC_LIBS ON) SET(Boost_USE_STATIC_RUNTIME ON) -SET(OpenSSL_DIR @prefix@/lib) +SET(OPENSSL_ROOT_DIR @prefix@) SET(ARCHITECTURE @arch@) # for libraries and headers in the target directories |