Merge pull request #3472

bd9a2d7 cmake: cleanup openssl (selsta)
This commit is contained in:
luigi1111 2021-09-09 16:53:34 -04:00
commit a3069e4a58
No known key found for this signature in database
GPG key ID: F4ACA0183641E010
2 changed files with 0 additions and 10 deletions

View file

@ -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()

View file

@ -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