diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2021-09-09 16:53:34 -0400 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2021-09-09 16:53:34 -0400 |
| commit | a3069e4a588ff43ba758dc814710b07d2cc5778c (patch) | |
| tree | 66081ca7ebc1437dc716792e8ba3f12a87a2ccbd | |
| parent | 3f48e3ef1cdb69f2601842c09f756727c999038a (diff) | |
| parent | bd9a2d7bbb66c59fe45a5160e8d7208ad819c1fd (diff) | |
| download | monzero-gui-a3069e4a588ff43ba758dc814710b07d2cc5778c.tar.gz monzero-gui-a3069e4a588ff43ba758dc814710b07d2cc5778c.tar.xz monzero-gui-a3069e4a588ff43ba758dc814710b07d2cc5778c.zip | |
Merge pull request #3472
bd9a2d7 cmake: cleanup openssl (selsta)
| -rw-r--r-- | CMakeLists.txt | 9 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 1 |
2 files changed, 0 insertions, 10 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 3b099ccd..93782659 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -109,15 +109,6 @@ monero_gui_add_library(gui_version SOURCES version.js DEPENDS genversiongui) message(STATUS "${CMAKE_MODULE_PATH}") -# OpenSSL -if(APPLE AND NOT OPENSSL_ROOT_DIR) - execute_process(COMMAND brew --prefix openssl OUTPUT_VARIABLE OPENSSL_ROOT_DIR OUTPUT_STRIP_TRAILING_WHITESPACE) -endif() -find_package(OpenSSL REQUIRED) -message(STATUS "OpenSSL: Version ${OPENSSL_VERSION}") -message(STATUS "OpenSSL: include dir at ${OPENSSL_INCLUDE_DIR}") -message(STATUS "OpenSSL: libraries at ${OPENSSL_LIBRARIES} ${OPENSSL_SSL_LIBRARIES}") - if(WITH_SCANNER) add_definitions(-DWITH_SCANNER) endif() diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 6c2b56b8..27b4dd09 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -102,7 +102,6 @@ target_include_directories(monero-wallet-gui PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/QR-Code-scanner ${CMAKE_CURRENT_SOURCE_DIR}/zxcvbn-c ${X11_INCLUDE_DIR} - ${OPENSSL_INCLUDE_DIR} ) target_compile_definitions(monero-wallet-gui |