diff options
| author | sfan5 <sfan5@live.de> | 2012-12-17 20:57:30 +0100 |
|---|---|---|
| committer | Ilya Zhuravlev <zhuravlevilya@ya.ru> | 2012-12-18 21:52:56 +0400 |
| commit | 05b58501f24ea0bcb6072f66f4ba3aa3ba907ab9 (patch) | |
| tree | 5585a21a415d3cc7719547cacf62727d04b68c40 | |
| parent | 29c17c14f1ef42f8080a44b1e3308f34de8b5df2 (diff) | |
| download | minetest-05b58501f24ea0bcb6072f66f4ba3aa3ba907ab9.tar.gz minetest-05b58501f24ea0bcb6072f66f4ba3aa3ba907ab9.tar.bz2 minetest-05b58501f24ea0bcb6072f66f4ba3aa3ba907ab9.zip | |
Tweak CMake files for cURL
| -rw-r--r-- | cmake/Modules/FindCURL.cmake | 41 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 7 |
2 files changed, 39 insertions, 9 deletions
diff --git a/cmake/Modules/FindCURL.cmake b/cmake/Modules/FindCURL.cmake index ec0503fd9..03ca4e0fa 100644 --- a/cmake/Modules/FindCURL.cmake +++ b/cmake/Modules/FindCURL.cmake @@ -5,13 +5,38 @@ # CURL_LIBRARY - List of libraries when using curl. # CURL_FOUND - True if curl found. -# Look for the header file. -FIND_PATH(CURL_INCLUDE_DIR NAMES curl/curl.h) +if( UNIX ) + FIND_PATH(CURL_INCLUDE_DIR NAMES curl.h + PATHS + /usr/local/include/curl + /usr/include/curl + ) -# Look for the library. -FIND_LIBRARY(CURL_LIBRARY NAMES curl) + FIND_LIBRARY(CURL_LIBRARY NAMES libcurl.a curl + PATHS + /usr/local/lib + /usr/lib + ) +else( UNIX ) + FIND_PATH(CURL_INCLUDE_DIR NAMES curl/curl.h) # Look for the header file. + FIND_LIBRARY(CURL_LIBRARY NAMES curl) # Look for the library. + INCLUDE(FindPackageHandleStandardArgs) # handle the QUIETLY and REQUIRED arguments and set CURL_FOUND to TRUE if + FIND_PACKAGE_HANDLE_STANDARD_ARGS(CURL DEFAULT_MSG CURL_LIBRARY CURL_INCLUDE_DIR) # all listed variables are TRUE +endif( UNIX ) -# handle the QUIETLY and REQUIRED arguments and set CURL_FOUND to TRUE if -# all listed variables are TRUE -INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(CURL DEFAULT_MSG CURL_LIBRARY CURL_INCLUDE_DIR) +if( WIN32 ) + if( CURL_LIBRARY AND CURL_INCLUDE_DIR AND CURL_DLL ) # libcurl.dll is required on Windows + SET(CURL_FOUND TRUE) + else( CURL_LIBRARY AND CURL_INCLUDE_DIR AND CURL_DLL ) + SET(CURL_FOUND FALSE) + endif( CURL_LIBRARY AND CURL_INCLUDE_DIR AND CURL_DLL ) +else ( WIN32 ) + if( CURL_LIBRARY AND CURL_INCLUDE_DIR ) + SET(CURL_FOUND TRUE) + else( CURL_LIBRARY AND CURL_INCLUDE_DIR ) + SET(CURL_FOUND FALSE) + endif( CURL_LIBRARY AND CURL_INCLUDE_DIR ) +endif ( WIN32 ) + +MESSAGE(STATUS "CURL_INCLUDE_DIR = ${CURL_INCLUDE_DIR}") +MESSAGE(STATUS "CURL_LIBRARY = ${CURL_LIBRARY}") diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 38410f7d2..107f580ce 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -12,7 +12,9 @@ if (NOT ENABLE_CURL) mark_as_advanced(CLEAR CURL_LIBRARY CURL_INCLUDE_DIR) endif(NOT ENABLE_CURL) -find_package(CURL) +if( ENABLE_CURL ) + find_package(CURL) +endif( ENABLE_CURL ) set(USE_CURL 0) if (CURL_FOUND AND ENABLE_CURL) message(STATUS "cURL support enabled") @@ -436,6 +438,9 @@ if(WIN32) if(VORBISFILE_DLL) install(FILES ${VORBISFILE_DLL} DESTINATION ${BINDIR}) endif() + if(CURL_DLL) + install(FILES ${CURL_DLL} DESTINATION ${BINDIR}) + endif() endif() endif() |