diff options
| author | Stefan Eissing <icing@apache.org> | 2023-04-18 08:55:44 +0000 |
|---|---|---|
| committer | Stefan Eissing <icing@apache.org> | 2023-04-18 08:55:44 +0000 |
| commit | 6b1f1209393a2783c5eac719c3a7a53cf521f70d (patch) | |
| tree | 50f1b48da0a651fe13b62f9bb936edf2aa234ae5 | |
| parent | 352fd2c766807ac8be127dba1b13f90c9632bb30 (diff) | |
| download | httpd-6b1f1209393a2783c5eac719c3a7a53cf521f70d.tar.gz | |
*) cmake support
PR #356 from github to fix linking libcurl used by mod_md
[@tumatanquang at github]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1909215 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | CMakeLists.txt | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 3ed34c7e10..e27d686301 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -85,6 +85,14 @@ ELSE() SET(default_check_libraries) ENDIF() +IF(EXISTS "${CMAKE_INSTALL_PREFIX}/lib/libcurl_imp.lib") + SET(default_curl_libraries "${CMAKE_INSTALL_PREFIX}/lib/libcurl_imp.lib") +ELSEIF(EXISTS "${CMAKE_INSTALL_PREFIX}/lib/libcurl.lib") + SET(default_curl_libraries "${CMAKE_INSTALL_PREFIX}/lib/libcurl.lib") +ELSE() + SET(default_curl_libraries) +ENDIF() + IF(EXISTS "${CMAKE_INSTALL_PREFIX}/lib/jansson.lib") SET(default_jansson_libraries "${CMAKE_INSTALL_PREFIX}/lib/jansson.lib") ELSE() @@ -102,6 +110,8 @@ SET(LIBXML2_ICONV_INCLUDE_DIR "" CACHE STRING "Directory SET(LIBXML2_ICONV_LIBRARIES "" CACHE STRING "iconv libraries to link with for libxml2") SET(BROTLI_INCLUDE_DIR "${CMAKE_INSTALL_PREFIX}/include" CACHE STRING "Directory with include files for Brotli") SET(BROTLI_LIBRARIES ${default_brotli_libraries} CACHE STRING "Brotli libraries to link with") +SET(CURL_INCLUDE_DIR "${CMAKE_INSTALL_PREFIX}/include" CACHE STRING "Directory with include files for cURL") +SET(CURL_LIBRARIES ${default_curl_libraries} CACHE STRING "cURL libraries to link with") SET(JANSSON_INCLUDE_DIR "${CMAKE_INSTALL_PREFIX}/include" CACHE STRING "Directory with include files for jansson") SET(JANSSON_LIBRARIES "${default_jansson_libraries}" CACHE STRING "Jansson libraries to link with") SET(CHECK_INCLUDE_DIR "${CMAKE_INSTALL_PREFIX}/include" CACHE STRING "Directory with include files for Check") @@ -1114,6 +1124,8 @@ MESSAGE(STATUS " Brotli libraries ................ : ${BROTLI_LIBRARIES}") MESSAGE(STATUS " Check include directory.......... : ${CHECK_INCLUDE_DIR}") MESSAGE(STATUS " Check libraries ................. : ${CHECK_LIBRARIES}") MESSAGE(STATUS " Curl include directory........... : ${CURL_INCLUDE_DIR}") +MESSAGE(STATUS " Curl libraries .................. : ${CURL_LIBRARIES}") +MESSAGE(STATUS " Jansson include directory ....... : ${JANSSON_INCLUDE_DIR}") MESSAGE(STATUS " Jansson libraries ............... : ${JANSSON_LIBRARIES}") MESSAGE(STATUS " Extra include directories ....... : ${EXTRA_INCLUDES}") MESSAGE(STATUS " Extra compile flags ............. : ${EXTRA_COMPILE_FLAGS}") |