diff options
| author | Alexander Blair <snipa@jagtech.io> | 2020-08-16 12:48:06 -0700 |
|---|---|---|
| committer | Alexander Blair <snipa@jagtech.io> | 2020-08-16 12:48:07 -0700 |
| commit | 79e93a8af8626156a1686140cb3f0f2758fa5ae6 (patch) | |
| tree | 0fa74c0c87b06c4c4030c682798a2c57fce75eb5 | |
| parent | Merge pull request #6689 (diff) | |
| parent | cmake: allow custom openssl path on macOS (diff) | |
| download | monero-79e93a8af8626156a1686140cb3f0f2758fa5ae6.tar.xz | |
Merge pull request #6691
6111689cf cmake: allow custom openssl path on macOS (selsta)
| -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 51e497260..2a16e0081 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -432,7 +432,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 422d9dede..383b88f31 100644 --- a/contrib/depends/toolchain.cmake.in +++ b/contrib/depends/toolchain.cmake.in @@ -56,7 +56,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 |