cmakify openssl

This commit is contained in:
Riccardo Spagni 2017-02-21 17:11:12 +02:00
parent 95f59f8c1f
commit 058eed369b
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
3 changed files with 20 additions and 17 deletions

View File

@ -311,6 +311,23 @@ else()
message(STATUS "Stack trace on exception disabled") message(STATUS "Stack trace on exception disabled")
endif() endif()
# Handle OpenSSL, used for sha256sum on binary updates
if (APPLE)
if (NOT OpenSSL_DIR)
EXECUTE_PROCESS(COMMAND brew --prefix openssl
OUTPUT_VARIABLE OPENSSL_ROOT_DIR
OUTPUT_STRIP_TRAILING_WHITESPACE)
message(STATUS "Using OpenSSL found at ${OPENSSL_ROOT_DIR}")
endif()
endif()
find_package(OpenSSL REQUIRED)
if(STATIC)
if(UNIX)
set(OPENSSL_LIBRARIES "${OPENSSL_LIBRARIES};${CMAKE_DL_LIBS}")
endif()
endif()
if (UNIX AND NOT APPLE) if (UNIX AND NOT APPLE)
# Note that at the time of this writing the -Wstrict-prototypes flag added below will make this fail # Note that at the time of this writing the -Wstrict-prototypes flag added below will make this fail
set(THREADS_PREFER_PTHREAD_FLAG ON) set(THREADS_PREFER_PTHREAD_FLAG ON)

View File

@ -30,22 +30,6 @@ cmake_minimum_required(VERSION 2.8.7)
project(unbound C) project(unbound C)
if (APPLE)
if (NOT OpenSSL_DIR)
EXECUTE_PROCESS(COMMAND brew --prefix openssl
OUTPUT_VARIABLE OPENSSL_ROOT_DIR
OUTPUT_STRIP_TRAILING_WHITESPACE)
message(STATUS "Using OpenSSL found at ${OPENSSL_ROOT_DIR}")
endif()
endif()
find_package(OpenSSL REQUIRED)
if(STATIC)
if(UNIX)
set(OPENSSL_LIBRARIES "${OPENSSL_LIBRARIES};${CMAKE_DL_LIBS}")
endif()
endif()
find_package(Threads) find_package(Threads)
include(configure_checks.cmake) include(configure_checks.cmake)

View File

@ -26,6 +26,8 @@
# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF # STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
# THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
include_directories(SYSTEM ${OPENSSL_INCLUDE_DIR})
set(common_sources set(common_sources
base58.cpp base58.cpp
command_line.cpp command_line.cpp
@ -78,7 +80,6 @@ target_link_libraries(common
PUBLIC PUBLIC
epee epee
crypto crypto
-lcrypto
${UNBOUND_LIBRARY} ${UNBOUND_LIBRARY}
${LIBUNWIND_LIBRARIES} ${LIBUNWIND_LIBRARIES}
${Boost_DATE_TIME_LIBRARY} ${Boost_DATE_TIME_LIBRARY}
@ -87,6 +88,7 @@ target_link_libraries(common
${Boost_THREAD_LIBRARY} ${Boost_THREAD_LIBRARY}
${Boost_REGEX_LIBRARY} ${Boost_REGEX_LIBRARY}
PRIVATE PRIVATE
${OPENSSL_LIBRARIES}
${EXTRA_LIBRARIES}) ${EXTRA_LIBRARIES})
#monero_install_headers(common #monero_install_headers(common