From f77f43bf284d6c4c3c87d804ca6f1e950c882ff4 Mon Sep 17 00:00:00 2001 From: Stefan Eissing Date: Fri, 30 Aug 2019 07:15:08 +0000 Subject: [PATCH] Merge of r1866119 from trunk: cmake for mod_md: interim fix by bill. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1866121 13f79535-47bb-0310-9956-ffa450edef68 --- CMakeLists.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5e27162b0c1..7a6c4b2651a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -470,7 +470,9 @@ SET(mod_lua_extra_sources modules/lua/lua_vmprep.c modules/lua/lua_dbd.c ) SET(mod_lua_requires LUA51_FOUND) -SET(mod_md_requires OPENSSL_FOUND CURL_FOUND JANSSON_FOUND HAVE_OPENSSL_102) +# TODO: _requires does not currently iterate a list, substitute the following once it does; +# SET(mod_md_requires OPENSSL_FOUND CURL_FOUND JANSSON_FOUND HAVE_OPENSSL_102) +SET(mod_md_requires CURL_FOUND) SET(mod_md_extra_includes ${OPENSSL_INCLUDE_DIR} ${CURL_INCLUDE_DIR} ${JANSSON_INCLUDE_DIR}) SET(mod_md_extra_libs ${OPENSSL_LIBRARIES} ${CURL_LIBRARIES} ${JANSSON_LIBRARIES} mod_watchdog) SET(mod_md_extra_sources @@ -705,6 +707,7 @@ SET(HTTPD_INCLUDE_DIRECTORIES ${CMAKE_CURRENT_SOURCE_DIR}/modules/session ${CMAKE_CURRENT_SOURCE_DIR}/modules/ssl ${CMAKE_CURRENT_SOURCE_DIR}/server + ${CMAKE_CURRENT_SOURCE_DIR}/server/mpm/winnt ${APR_INCLUDE_DIR} ${PCRE_INCLUDE_DIR} ) -- 2.47.3