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

cmake: use stock Find* modules. #10178

Merged
merged 2 commits into from
Jul 7, 2016
Merged

cmake: use stock Find* modules. #10178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3646fa5
cmake: use the stock FindEXPAT.cmake
tchaikov Jul 6, 2016
b5bb77d
cmake: use the stock FindCURL.cmake
tchaikov Jul 6, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 5 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ endif(${WITH_LEVELDB})

option(WITH_EXPAT "EXPAT is here" ON)
if(${WITH_EXPAT})
find_package(expat REQUIRED)
find_package(EXPAT REQUIRED)
endif(${WITH_EXPAT})

find_package(Cython REQUIRED)
Expand Down Expand Up @@ -273,7 +273,10 @@ find_package(keyutils REQUIRED)

find_package(libuuid REQUIRED)

find_package(libcurl REQUIRED)
find_package(CURL REQUIRED)
set(CMAKE_REQUIRED_INCLUDES ${CURL_INCLUDE_DIRS})
set(CMAKE_REQUIRED_LIBRARIES ${CURL_LIBRARIES})
CHECK_SYMBOL_EXISTS(curl_multi_wait "curl.h" HAVE_CURL_MULTI_WAIT)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you kept the HAVE_CURL_MULTI_WAIT part, looks good 👍


# nss or cryptopp?
option(WITH_NSS "Use NSS crypto and SSL implementations" ON)
Expand Down
29 changes: 0 additions & 29 deletions cmake/modules/Findexpat.cmake
View file
Open in desktop

This file was deleted.

40 changes: 0 additions & 40 deletions cmake/modules/Findlibcurl.cmake
View file
Open in desktop

This file was deleted.