From de9ae7a67b5fe93e9dd0705f25b3c135e2ac9c51 Mon Sep 17 00:00:00 2001 From: "Pfifer, Justin" Date: Wed, 15 Nov 2017 13:24:46 -0800 Subject: [PATCH] Remove libidn From Linking, and Correctly Use Static UUID Removed the libidn, as it's no longer required. Use the correct formulation of find_library for the static version of libuuid. --- CMakeLists.txt | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6b2757bf..eff273d5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -121,7 +121,7 @@ if(LINUX) set(ADDITIONAL_LIBS idn) endif() -# Ensure that we can find the necessar libraries for Linux builds +# Ensure that we can find the necessary libraries for Linux builds include(CheckLibraryExists) if(LINUX) # @@ -142,18 +142,11 @@ if(LINUX) endif(NOT HAVE_DL_OPEN) set(LIBDL_LIBRARIES dl) - # - # Find libidn which is required as part of the AWS C++ SDK - # - add_library(libIdn STATIC IMPORTED) - set_property(TARGET libIdn PROPERTY IMPORTED_LOCATION ${THIRD_PARTY_LIB_DIR}/libidn.a) - set(LIBIDN_LIBRARIES idn) - # # Find libuuid which is another dependency of the AWS C++ SDK # TODO: Normalize this with the rest of the library checks # - find_library(UUID_LIBRARIES uuid NAMES libuuid.a) + find_library(UUID_LIBRARIES NAMES libuuid.a uuid) if("${UUID_INCLUDE_DIR}" STREQUAL "UUID_INCLUDE_DIR-NOTFOUND" OR "${UUID_LIBRARIES}" STREQUAL "UUID_LIBRARIES-NOTFOUND") message(FATAL_ERROR "Could not find uuid components") else()