You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ic...@apache.org on 2019/08/30 07:13:28 UTC
svn commit: r1866119 - /httpd/httpd/trunk/CMakeLists.txt
Author: icing
Date: Fri Aug 30 07:13:28 2019
New Revision: 1866119
URL: http://svn.apache.org/viewvc?rev=1866119&view=rev
Log:
Improvement to mod_md cmake support. thanks to bill.
Modified:
httpd/httpd/trunk/CMakeLists.txt
Modified: httpd/httpd/trunk/CMakeLists.txt
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CMakeLists.txt?rev=1866119&r1=1866118&r2=1866119&view=diff
==============================================================================
--- httpd/httpd/trunk/CMakeLists.txt (original)
+++ httpd/httpd/trunk/CMakeLists.txt Fri Aug 30 07:13:28 2019
@@ -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}
)