From: Stefan Eissing <icing@apache.org>
Date: Fri, 30 Aug 2019 07:13:28 +0000 (+0000)
Subject: Improvement to mod_md cmake support. thanks to bill.
X-Git-Tag: 2.5.0-alpha2-ci-test-only~1907
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=238d19c62d61a2b313e4189f25ebd51191e7c099;p=thirdparty%2Fapache%2Fhttpd.git

Improvement to mod_md cmake support. thanks to bill.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1866119 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ecf47d54b08..de746d271ab 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -508,7 +508,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
@@ -763,6 +765,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}
 )