Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove libidn From Linking, and Correctly Use Static UUID #157

Merged
merged 1 commit into from
Nov 20, 2017
Merged

Remove libidn From Linking, and Correctly Use Static UUID #157

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 2 additions & 9 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
#
Expand All @@ -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()
Expand Down