From ce174e7f211ff3ef6a5f275f5c60f2eeefe27241 Mon Sep 17 00:00:00 2001 From: Prasenjit Kumar Shaw Date: Wed, 3 Jul 2019 15:25:13 +0530 Subject: [PATCH] Add Find Cmake files for libhogweed and libgmp required by nettle --- CMakeLists.txt | 6 ++++++ cmake/FindGMP.cmake | 16 ++++++++++++++++ cmake/FindHogweed.cmake | 12 ++++++++++++ src/lib/CMakeLists.txt | 3 +++ 4 files changed, 37 insertions(+) create mode 100644 cmake/FindGMP.cmake create mode 100644 cmake/FindHogweed.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index 2c93d2ea6..0927b8c09 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -91,6 +91,12 @@ find_package(OpenSSL REQUIRED) # Mandatory: Nettle find_package(Nettle REQUIRED) +# Mandatory: Hogweed +find_package(Hogweed REQUIRED) + +# Mandatory: GMP +find_package(GMP REQUIRED) + # Mandatory: KF5 find_package(KF5 REQUIRED COMPONENTS Archive) diff --git a/cmake/FindGMP.cmake b/cmake/FindGMP.cmake new file mode 100644 index 000000000..aa2116965 --- /dev/null +++ b/cmake/FindGMP.cmake @@ -0,0 +1,16 @@ +if (GMP_INCLUDE_DIR AND GMP_LIBRARY) + set(GMP_FIND_QUIETLY TRUE) +endif (GMP_INCLUDE_DIR AND GMP_LIBRARY) + +find_path(GMP_INCLUDE_DIR NAMES gmp.h + PATHS $ENV{GMPDIR} ${INCLUDE_INSTALL_DIR} +) + +find_library(GMP_LIBRARY gmp + PATHS $ENV{GMPDIR} ${LIB_INSTALL_DIR} +) + +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(GMP DEFAULT_MSG + GMP_INCLUDE_DIR GMP_LIBRARY) +mark_as_advanced(GMP_INCLUDE_DIR GMP_LIBRARY) diff --git a/cmake/FindHogweed.cmake b/cmake/FindHogweed.cmake new file mode 100644 index 000000000..bc1a15b1e --- /dev/null +++ b/cmake/FindHogweed.cmake @@ -0,0 +1,12 @@ +if (HOGWEED_LIBRARY) + set(HOGWEED_FIND_QUIETLY TRUE) +endif (HOGWEED_LIBRARY) + +find_library(HOGWEED_LIBRARY hogweed + PATHS $ENV{HOGWEEDDIR} ${LIB_INSTALL_DIR} +) + +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(HOGWEED DEFAULT_MSG + HOGWEED_LIBRARY) +mark_as_advanced(HOGWEED_LIBRARY) diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt index 834f129a3..22f3dc3e0 100644 --- a/src/lib/CMakeLists.txt +++ b/src/lib/CMakeLists.txt @@ -41,6 +41,7 @@ include_directories( include_directories(${OPENSSL_INCLUDE_DIR}) include_directories(${NETTLE_INCLUDE_DIR}) +include_directories(${GMP_INCLUDE_DIR}) set(SRCS ${SRCS} 3rdparty/fancytabwidget.cpp @@ -360,6 +361,8 @@ target_link_libraries(FalkonPrivate KF5::Archive ${OPENSSL_CRYPTO_LIBRARY} ${NETTLE_LIBRARY} + ${GMP_LIBRARY} + ${HOGWEED_LIBRARY} ) if (UNIX AND NOT APPLE)