]> granicus.if.org Git - apache/blobdiff - CMakeLists.txt
Fix a cmake compatiblity issue related to quoting with cmake 2.8.12
[apache] / CMakeLists.txt
index 5605ab0a0dbf61d30085499e2aa791522c92cdf8..082241f699722a92fa16c72c5657e2e90459c154 100644 (file)
@@ -27,11 +27,6 @@ FIND_PACKAGE(Lua51)
 FIND_PACKAGE(OpenSSL)
 FIND_PACKAGE(ZLIB)
 
-# See what version we're building.  Just look at AP_SERVER_MINORVERSION_NUMBER
-SET(minorversion_regex "^#define AP_SERVER_MINORVERSION_NUMBER ([0-9]+)$")
-FILE(STRINGS ${CMAKE_CURRENT_SOURCE_DIR}/include/ap_release.h minorversion REGEX ${minorversion_regex})
-STRING(REGEX REPLACE ${minorversion_regex} "\\1" minorversion ${minorversion})
-
 # Options for support libraries not supported by cmake-bundled FindFOO
 
 # Default to using APR trunk (libapr-2.lib) if it exists in PREFIX/lib;
@@ -71,7 +66,9 @@ OPTION(INSTALL_MANUAL     "Install manual"                     ON)
 
 SET(ENABLE_MODULES        "O"                            CACHE STRING "Minimum module enablement (e.g., \"i\" to build all but those without prerequisites)")
 SET(WITH_MODULES          ""                             CACHE STRING "comma-separated paths to single-file modules to statically link into the server")
-SET(EXTRA_INCLUDE_DIRS    ""                             CACHE STRING "extra include directories")
+SET(EXTRA_INCLUDES        ""                             CACHE STRING "Extra include directories")
+SET(EXTRA_LIBS            ""                             CACHE STRING "Extra libraries")
+SET(EXTRA_COMPILE_FLAGS   ""                             CACHE STRING "Extra compile flags")
 
 IF(NOT EXISTS "${APR_INCLUDE_DIR}/apr.h")
   MESSAGE(FATAL_ERROR "APR include directory ${APR_INCLUDE_DIR} is not correct.")
@@ -82,6 +79,16 @@ FOREACH(onelib ${APR_LIBRARIES})
   ENDIF()
 ENDFOREACH()
 
+MACRO(DEFINE_WITH_BLANKS output_definition input_symbol input_value)
+  IF(MSVC_IDE OR ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION} VERSION_GREATER 2.8.11)
+    SET(${output_definition} "-D${input_symbol}=\"${input_value}\"")
+  ELSE()
+    # command-line tool + older cmake, where extra quotes must be added and
+    # escaped to survive
+    SET(${output_definition} "-D${input_symbol}=\"\\\"${input_value}\\\"\"")
+  ENDIF()
+ENDMACRO()
+
 MACRO(GET_MOD_ENABLE_RANK macro_modname macro_mod_enable_val macro_output_rank)
   IF(${macro_mod_enable_val} STREQUAL "O")
     SET(${macro_output_rank} 0)
@@ -151,6 +158,18 @@ ELSE()
   SET(APR_HAS_LDAP FALSE)
 ENDIF()
 
+# See if we have OpenSSL 1.0.2
+SET(HAVE_OPENSSL_102 FALSE)
+IF(OPENSSL_FOUND)
+  STRING(REGEX REPLACE "^1\\.([0-9]+)\\.[0-9]+" "\\1" minor_ver ${OPENSSL_VERSION})
+  STRING(REGEX REPLACE "^1\\.[0-9]+\\.([0-9]+)" "\\1" patch_ver ${OPENSSL_VERSION})
+  IF(${minor_ver} GREATER "0")
+    SET(HAVE_OPENSSL_102 TRUE)
+  ELSEIF(${patch_ver} GREATER "1")
+    SET(HAVE_OPENSSL_102 TRUE)
+  ENDIF()
+ENDIF()
+
 MESSAGE(STATUS "")
 MESSAGE(STATUS "Summary of feature detection:")
 MESSAGE(STATUS "")
@@ -186,6 +205,7 @@ MESSAGE(STATUS "")
 #
 SET(MODULE_LIST
   "modules/aaa/mod_access_compat+A+mod_access compatibility"
+  "modules/aaa/mod_allowhandlers+I+restrict allowed handlers"
   "modules/aaa/mod_allowmethods+I+restrict allowed HTTP methods"
   "modules/aaa/mod_auth_basic+A+basic authentication"
   "modules/aaa/mod_auth_digest+I+RFC2617 Digest authentication"
@@ -196,6 +216,7 @@ SET(MODULE_LIST
   "modules/aaa/mod_authn_dbm+I+DBM-based authentication control"
   "modules/aaa/mod_authn_file+A+file-based authentication control"
   "modules/aaa/mod_authn_socache+I+Cached authentication control"
+  "modules/aaa/mod_authnz_fcgi+I+FastCGI authorizer-based authentication and authorization"
   "modules/aaa/mod_authnz_ldap+i+LDAP based authentication"
   "modules/aaa/mod_authz_core+A+core authorization provider vector module"
   "modules/aaa/mod_authz_dbd+I+SQL based authorization and Login/Session support"
@@ -204,6 +225,7 @@ SET(MODULE_LIST
   "modules/aaa/mod_authz_host+A+host-based authorization control"
   "modules/aaa/mod_authz_owner+I+'require file-owner' authorization control"
   "modules/aaa/mod_authz_user+A+'require user' authorization control"
+  "modules/apreq/mod_apreq+i+Apache Request Filter"
   "modules/arch/win32/mod_isapi+I+isapi extension support"
   "modules/cache/mod_cache+I+dynamic file caching.  At least one storage management module (e.g. mod_cache_disk) is also necessary."
   "modules/cache/mod_cache_disk+I+disk caching module"
@@ -223,6 +245,7 @@ SET(MODULE_LIST
   "modules/dav/main/mod_dav+I+WebDAV protocol handling."
   "modules/debugging/mod_bucketeer+O+buckets manipulation filter.  Useful only for developers and testing purposes."
   "modules/debugging/mod_dumpio+I+I/O dump filter"
+  "modules/debugging/mod_firehose+O+Firehose dump filter"
   "modules/echo/mod_echo+O+ECHO server"
   "modules/examples/mod_case_filter+O+Example uppercase conversion filter"
   "modules/examples/mod_case_filter_in+O+Example uppercase conversion input filter"
@@ -289,6 +312,7 @@ SET(MODULE_LIST
   "modules/proxy/mod_proxy_http+I+Apache proxy HTTP module.  Requires and is enabled by --enable-proxy."
   "modules/proxy/mod_proxy_scgi+I+Apache proxy SCGI module.  Requires and is enabled by --enable-proxy."
   "modules/proxy/mod_proxy_wstunnel+I+Apache proxy Websocket Tunnel module.  Requires and is enabled by --enable-proxy."
+  "modules/proxy/mod_serf+O+Reverse proxy module using Serf"
   "modules/session/mod_session+I+session module"
   "modules/session/mod_session_cookie+I+session cookie module"
   "modules/session/mod_session_crypto+i+session crypto module"
@@ -296,25 +320,17 @@ SET(MODULE_LIST
   "modules/slotmem/mod_slotmem_plain+I+slotmem provider that uses plain memory"
   "modules/slotmem/mod_slotmem_shm+I+slotmem provider that uses shared memory"
   "modules/ssl/mod_ssl+i+SSL/TLS support"
+  "modules/ssl/mod_ssl_ct+O+Certificate Transparency support (requires OpenSSL >= 1.0.2)"
   "modules/test/mod_dialup+O+rate limits static files to dialup modem speeds"
   "modules/test/mod_optional_fn_export+O+example optional function exporter"
   "modules/test/mod_optional_fn_import+O+example optional function importer"
   "modules/test/mod_optional_hook_export+O+example optional hook exporter"
   "modules/test/mod_optional_hook_import+O+example optional hook importer"
+  "modules/test/mod_policy+I+HTTP protocol compliance filters"
 )
 
-IF(NOT ${minorversion} STREQUAL "4")
-  # more modules in trunk
-  SET(MODULE_LIST
-      ${MODULE_LIST}
-      "modules/aaa/mod_allowhandlers+I+restrict allowed handlers"
-      "modules/aaa/mod_authnz_fcgi+I+FastCGI authorizer-based authentication and authorization"
-      "modules/apreq/mod_apreq+i+Apache Request Filter"
-      "modules/debugging/mod_firehose+O+Firehose dump filter"
-      "modules/proxy/mod_serf+O+Reverse proxy module using Serf"
-      "modules/test/mod_policy+I+HTTP protocol compliance filters"
-  )
-ENDIF()
+# Track which modules actually built have APIs to link against.
+SET(installed_mod_libs_exps)
 
 # Define extra definitions, sources, headers, etc. required by some modules.
 # This could be included in the master list of modules above, though it 
@@ -329,6 +345,7 @@ SET(mod_cache_extra_defines          CACHE_DECLARE_EXPORT)
 SET(mod_cache_extra_sources
   modules/cache/cache_storage.c      modules/cache/cache_util.c
 )
+SET(mod_cache_install_lib 1)
 SET(mod_cache_disk_extra_libs        mod_cache)
 SET(mod_cache_socache_extra_libs     mod_cache)
 SET(mod_charset_lite_requires        APR_HAS_XLATE)
@@ -338,6 +355,7 @@ SET(mod_dav_extra_sources
   modules/dav/main/std_liveprop.c    modules/dav/main/providers.c
   modules/dav/main/util.c            modules/dav/main/util_lock.c
 )
+SET(mod_dav_install_lib 1)
 SET(mod_dav_fs_extra_sources
   modules/dav/fs/dbm.c               modules/dav/fs/lock.c
   modules/dav/fs/repos.c
@@ -372,6 +390,7 @@ SET(mod_lua_requires                 LUA51_FOUND)
 SET(mod_optional_hook_export_extra_defines AP_DECLARE_EXPORT) # bogus reuse of core API prefix
 SET(mod_proxy_extra_defines          PROXY_DECLARE_EXPORT)
 SET(mod_proxy_extra_sources          modules/proxy/proxy_util.c)
+SET(mod_proxy_install_lib 1)
 SET(mod_proxy_ajp_extra_sources
   modules/proxy/ajp_header.c         modules/proxy/ajp_link.c
   modules/proxy/ajp_msg.c            modules/proxy/ajp_utils.c
@@ -397,18 +416,20 @@ SET(mod_sed_extra_sources
 )
 SET(mod_serf_requires                AN_UNIMPLEMENTED_SUPPORT_LIBRARY_REQUIREMENT)
 SET(mod_session_extra_defines        SESSION_DECLARE_EXPORT)
+SET(mod_session_install_lib 1)
 SET(mod_session_cookie_extra_libs    mod_session)
 SET(mod_session_crypto_requires      APU_HAVE_CRYPTO)
 SET(mod_session_crypto_extra_libs    mod_session)
 SET(mod_session_dbd_extra_libs       mod_session)
 SET(mod_socache_dc_requires          AN_UNIMPLEMENTED_SUPPORT_LIBRARY_REQUIREMENT)
+SET(mod_ssl_extra_defines            SSL_DECLARE_EXPORT)
 SET(mod_ssl_requires                 OPENSSL_FOUND)
 IF(OPENSSL_FOUND)
   SET(mod_ssl_extra_includes           ${OPENSSL_INCLUDE_DIR})
   SET(mod_ssl_extra_libs               ${OPENSSL_LIBRARIES})
 ENDIF()
 SET(mod_ssl_extra_sources
-  modules/ssl/ssl_engine_config.c    modules/ssl/ssl_engine_dh.c
+  modules/ssl/ssl_engine_config.c
   modules/ssl/ssl_engine_init.c      modules/ssl/ssl_engine_io.c
   modules/ssl/ssl_engine_kernel.c    modules/ssl/ssl_engine_log.c
   modules/ssl/ssl_engine_mutex.c     modules/ssl/ssl_engine_ocsp.c
@@ -417,7 +438,18 @@ SET(mod_ssl_extra_sources
   modules/ssl/ssl_util.c             modules/ssl/ssl_util_ocsp.c
   modules/ssl/ssl_util_ssl.c         modules/ssl/ssl_util_stapling.c
 )
+SET(mod_ssl_ct_requires              HAVE_OPENSSL_102)
+IF(OPENSSL_FOUND)
+  SET(mod_ssl_ct_extra_includes        ${OPENSSL_INCLUDE_DIR})
+  SET(mod_ssl_ct_extra_libs            ${OPENSSL_LIBRARIES})
+ENDIF()
+SET(mod_ssl_ct_extra_sources
+  modules/ssl/ssl_ct_log_config.c
+  modules/ssl/ssl_ct_sct.c
+  modules/ssl/ssl_ct_util.c
+)
 SET(mod_status_extra_defines         STATUS_DECLARE_EXPORT)
+SET(mod_watchdog_install_lib 1)
 SET(mod_xml2enc_requires             LIBXML2_FOUND)
 IF(LIBXML2_FOUND)
   SET(mod_xml2enc_extra_includes     "${LIBXML2_INCLUDE_DIR};${LIBXML2_ICONV_INCLUDE_DIR}")
@@ -505,6 +537,17 @@ SET(HTTPD_MAIN_SOURCES
 SET(LIBHTTPD_SOURCES
   ${extra_builtin_modules}
   ${PROJECT_BINARY_DIR}/modules.c
+  server/apreq_cookie.c
+  server/apreq_error.c
+  server/apreq_module.c
+  server/apreq_module_cgi.c
+  server/apreq_module_custom.c
+  server/apreq_param.c
+  server/apreq_parser.c
+  server/apreq_parser_header.c
+  server/apreq_parser_multipart.c
+  server/apreq_parser_urlencoded.c
+  server/apreq_util.c
   modules/arch/win32/mod_win32.c
   modules/core/mod_so.c
   modules/http/byterange_filter.c
@@ -540,6 +583,7 @@ SET(LIBHTTPD_SOURCES
   server/util_cookies.c
   server/util_expr_eval.c
   server/util_expr_parse.c
+  server/util_fcgi.c
   server/util_expr_scan.c
   server/util_filter.c
   server/util_md5.c
@@ -552,32 +596,12 @@ SET(LIBHTTPD_SOURCES
   server/vhost.c
 )
 
-IF(NOT ${minorversion} STREQUAL "4")
-  # more libhttpd sources in trunk
-  SET(LIBHTTPD_SOURCES
-      ${LIBHTTPD_SOURCES}
-      server/apreq_cookie.c
-      server/apreq_error.c
-      server/apreq_module.c
-      server/apreq_module_cgi.c
-      server/apreq_module_custom.c
-      server/apreq_param.c
-      server/apreq_parser.c
-      server/apreq_parser_header.c
-      server/apreq_parser_multipart.c
-      server/apreq_parser_urlencoded.c
-      server/apreq_util.c
-      server/skiplist.c
-      server/util_fcgi.c
-  )
-ENDIF()
-
 CONFIGURE_FILE(os/win32/win32_config_layout.h
                ${PROJECT_BINARY_DIR}/ap_config_layout.h)
 
 SET(HTTPD_INCLUDE_DIRECTORIES
   ${PROJECT_BINARY_DIR}
-  ${EXTRA_INCLUDE_DIRS}
+  ${EXTRA_INCLUDES}
   # see discussion in cmake bug 13188 regarding oddities with relative paths
   ${CMAKE_CURRENT_SOURCE_DIR}/include
   ${CMAKE_CURRENT_SOURCE_DIR}/os/win32
@@ -614,6 +638,7 @@ SET(other_installed_h
   ${CMAKE_CURRENT_SOURCE_DIR}/modules/proxy/mod_proxy.h
   ${CMAKE_CURRENT_SOURCE_DIR}/modules/session/mod_session.h
   ${CMAKE_CURRENT_SOURCE_DIR}/modules/ssl/mod_ssl.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/modules/ssl/mod_ssl_openssl.h
 )
 # When mod_serf is buildable, don't forget to copy modules/proxy/mod_serf.h
 
@@ -689,15 +714,24 @@ FOREACH (mod ${MODULE_PATHS})
       SET(tmp_mod_main_source ${${mod_main_source}})
     ENDIF()
     SET(all_mod_sources ${tmp_mod_main_source} ${${mod_extra_sources}})
-    ADD_LIBRARY(${mod_name} SHARED ${all_mod_sources})
+    ADD_LIBRARY(${mod_name} SHARED ${all_mod_sources} build/win32/httpd.rc)
     SET(install_modules ${install_modules} ${mod_name})
     SET(install_modules_pdb ${install_modules_pdb} "${PROJECT_BINARY_DIR}/${mod_name}.pdb")
+    IF("${${mod_name}_install_lib}")
+      SET(installed_mod_libs_exps
+          ${installed_mod_libs_exps}
+          "${PROJECT_BINARY_DIR}/${mod_name}.lib"
+          "${PROJECT_BINARY_DIR}/${mod_name}.exp"
+      )
+    ENDIF()
     SET(mod_extra_libs "${mod_name}_extra_libs")
     SET_TARGET_PROPERTIES(${mod_name} PROPERTIES
       SUFFIX .so
       LINK_FLAGS /base:@${PROJECT_BINARY_DIR}/BaseAddr.ref,${mod_name}.so
     )
-    TARGET_LINK_LIBRARIES(${mod_name} ${${mod_extra_libs}} libhttpd ${APR_LIBRARIES} ${HTTPD_SYSTEM_LIBS})
+    TARGET_LINK_LIBRARIES(${mod_name} ${${mod_extra_libs}} libhttpd ${EXTRA_LIBS} ${APR_LIBRARIES} ${HTTPD_SYSTEM_LIBS})
+    DEFINE_WITH_BLANKS(define_long_name "LONG_NAME" "${mod_name} for Apache HTTP Server")
+    SET_TARGET_PROPERTIES(${mod_name} PROPERTIES COMPILE_FLAGS "${define_long_name} -DBIN_NAME=${mod_name}.so ${EXTRA_COMPILE_FLAGS}")
 
     # Extra defines?
     SET(mod_extra_defines "${mod_name}_extra_defines")
@@ -708,7 +742,7 @@ FOREACH (mod ${MODULE_PATHS})
     # Extra includes?
     SET(mod_extra_includes "${mod_name}_extra_includes")
     IF(NOT "${${mod_extra_includes}}" STREQUAL "")
-      SET(tmp_includes ${${mod_extra_includes}} ${HTTPD_INCLUDE_DIRECTORIES})
+      SET(tmp_includes ${HTTPD_INCLUDE_DIRECTORIES} ${${mod_extra_includes}})
       SET_TARGET_PROPERTIES(${mod_name} PROPERTIES INCLUDE_DIRECTORIES "${tmp_includes}")
       GET_PROPERTY(tmp_includes TARGET ${mod_name} PROPERTY INCLUDE_DIRECTORIES)
     ENDIF()
@@ -717,27 +751,24 @@ FOREACH (mod ${MODULE_PATHS})
 ENDFOREACH()
 
 ###########   HTTPD LIBRARIES   ############
-ADD_LIBRARY(libhttpd SHARED ${LIBHTTPD_SOURCES})
+ADD_LIBRARY(libhttpd SHARED ${LIBHTTPD_SOURCES} build/win32/httpd.rc)
 SET_TARGET_PROPERTIES(libhttpd PROPERTIES
   LINK_FLAGS /base:@${PROJECT_BINARY_DIR}/BaseAddr.ref,libhttpd.dll
 )
 SET(install_targets ${install_targets} libhttpd)
 SET(install_bin_pdb ${install_bin_pdb} ${PROJECT_BINARY_DIR}/libhttpd.pdb)
-TARGET_LINK_LIBRARIES(libhttpd ${APR_LIBRARIES} ${PCRE_LIBRARIES} ${HTTPD_SYSTEM_LIBS})
-IF(NOT ${minorversion} STREQUAL "4")
-  # trunk needs apreq symbols exported
-  SET_TARGET_PROPERTIES(libhttpd PROPERTIES COMPILE_FLAGS "-DAP_DECLARE_EXPORT -DAPREQ_DECLARE_EXPORT")
-ELSE()
-  SET_TARGET_PROPERTIES(libhttpd PROPERTIES COMPILE_FLAGS -DAP_DECLARE_EXPORT)
-ENDIF()
+TARGET_LINK_LIBRARIES(libhttpd ${EXTRA_LIBS} ${APR_LIBRARIES} ${PCRE_LIBRARIES} ${HTTPD_SYSTEM_LIBS})
+DEFINE_WITH_BLANKS(define_long_name "LONG_NAME" "Apache HTTP Server Core")
+SET_TARGET_PROPERTIES(libhttpd PROPERTIES COMPILE_FLAGS "-DAP_DECLARE_EXPORT -DAPREQ_DECLARE_EXPORT ${define_long_name} -DBIN_NAME=libhttpd.dll ${EXTRA_COMPILE_FLAGS}")
 ADD_DEPENDENCIES(libhttpd test_char_header)
 
 ###########   HTTPD EXECUTABLES   ##########
 ADD_EXECUTABLE(httpd server/main.c build/win32/httpd.rc)
 SET(install_targets ${install_targets} httpd)
 SET(install_bin_pdb ${install_bin_pdb} ${PROJECT_BINARY_DIR}/httpd.pdb)
-SET_TARGET_PROPERTIES(httpd PROPERTIES COMPILE_FLAGS "-DLONG_NAME=\"\\\"Apache HTTP Server\\\"\" -DBIN_NAME=httpd.exe")
-TARGET_LINK_LIBRARIES(httpd libhttpd)
+DEFINE_WITH_BLANKS(define_long_name "LONG_NAME" "Apache HTTP Server")
+SET_TARGET_PROPERTIES(httpd PROPERTIES COMPILE_FLAGS "-DAPP_FILE ${define_long_name} -DBIN_NAME=httpd.exe -DICON_FILE=${CMAKE_SOURCE_DIR}/build/win32/apache.ico ${EXTRA_COMPILE_FLAGS}")
+TARGET_LINK_LIBRARIES(httpd libhttpd ${EXTRA_LIBS})
 
 SET(standard_support
   ab
@@ -755,20 +786,24 @@ SET(htpasswd_extra_sources support/passwd_common.c)
 
 FOREACH(pgm ${standard_support})
   SET(extra_sources ${pgm}_extra_sources)
-  ADD_EXECUTABLE(${pgm} support/${pgm}.c ${${extra_sources}})
+  ADD_EXECUTABLE(${pgm} support/${pgm}.c ${${extra_sources}} build/win32/httpd.rc)
   SET(install_targets ${install_targets} ${pgm})
   SET(install_bin_pdb ${install_bin_pdb} ${PROJECT_BINARY_DIR}/${pgm}.pdb)
-  TARGET_LINK_LIBRARIES(${pgm} ${APR_LIBRARIES})
+  DEFINE_WITH_BLANKS(define_long_name "LONG_NAME" "Apache HTTP Server ${pgm} program")
+  SET_TARGET_PROPERTIES(${pgm} PROPERTIES COMPILE_FLAGS "-DAPP_FILE ${define_long_name} -DBIN_NAME=${pgm}.exe ${EXTRA_COMPILE_FLAGS}")
+  TARGET_LINK_LIBRARIES(${pgm} ${EXTRA_LIBS} ${APR_LIBRARIES})
 ENDFOREACH()
 
 IF(OPENSSL_FOUND)
-  ADD_EXECUTABLE(abs support/ab.c)
+  ADD_EXECUTABLE(abs support/ab.c build/win32/httpd.rc)
   SET(install_targets ${install_targets} abs)
   SET(install_bin_pdb ${install_bin_pdb} ${PROJECT_BINARY_DIR}/abs.pdb)
   SET_TARGET_PROPERTIES(abs PROPERTIES COMPILE_DEFINITIONS HAVE_OPENSSL)
   SET(tmp_includes ${HTTPD_INCLUDE_DIRECTORIES} ${OPENSSL_INCLUDE_DIR})
   SET_TARGET_PROPERTIES(abs PROPERTIES INCLUDE_DIRECTORIES "${tmp_includes}")
-  TARGET_LINK_LIBRARIES(abs ${APR_LIBRARIES} ${OPENSSL_LIBRARIES})
+  DEFINE_WITH_BLANKS(define_long_name "LONG_NAME" "Apache HTTP Server ab/SSL program")
+  SET_TARGET_PROPERTIES(abs PROPERTIES COMPILE_FLAGS "-DAPP_FILE ${define_long_name} -DBIN_NAME=abs.exe ${EXTRA_COMPILE_FLAGS}")
+  TARGET_LINK_LIBRARIES(abs ${EXTRA_LIBS} ${APR_LIBRARIES} ${OPENSSL_LIBRARIES})
 ENDIF()
 GET_PROPERTY(tmp_includes TARGET ab PROPERTY INCLUDE_DIRECTORIES)
 
@@ -777,7 +812,8 @@ GET_PROPERTY(tmp_includes TARGET ab PROPERTY INCLUDE_DIRECTORIES)
 # SET(install_targets ${install_targets} ApacheMonitor)
 # SET(install_bin_pdb ${install_bin_pdb} ${PROJECT_BINARY_DIR}/ApacheMonitor.pdb)
 # SET_TARGET_PROPERTIES(ApacheMonitor PROPERTIES WIN32_EXECUTABLE TRUE)
-# TARGET_LINK_LIBRARIES(ApacheMonitor ${HTTPD_SYSTEM_LIBS} comctl32 wtsapi32)
+# SET_TARGET_PROPERTIES(ApacheMonitor PROPERTIES COMPILE_FLAGS "-DAPP_FILE -DLONG_NAME=ApacheMonitor -DBIN_NAME=ApacheMonitor.exe ${EXTRA_COMPILE_FLAGS}")
+# TARGET_LINK_LIBRARIES(ApacheMonitor ${EXTRA_LIBS} ${HTTPD_SYSTEM_LIBS} comctl32 wtsapi32)
 
 ###########  CONFIGURATION FILES ###########
 # Set up variables used in the .conf file templates
@@ -830,6 +866,9 @@ INSTALL(DIRECTORY include/ DESTINATION include
     FILES_MATCHING PATTERN "*.h"
 )
 INSTALL(FILES ${other_installed_h} DESTINATION include)
+INSTALL(FILES ${installed_mod_libs_exps} DESTINATION lib)
+INSTALL(FILES "${CMAKE_BINARY_DIR}/libhttpd.exp" DESTINATION LIB)
+INSTALL(FILES support/ctlogconfig DESTINATION bin)
 
 IF(INSTALL_MANUAL) # Silly?  This takes a while, and a dev doesn't need it.
   INSTALL(DIRECTORY docs/manual/ DESTINATION manual)
@@ -867,11 +906,15 @@ MESSAGE(STATUS "  Install prefix .................. : ${CMAKE_INSTALL_PREFIX}")
 MESSAGE(STATUS "  C compiler ...................... : ${CMAKE_C_COMPILER}")
 MESSAGE(STATUS "  APR include directory ........... : ${APR_INCLUDE_DIR}")
 MESSAGE(STATUS "  APR libraries ................... : ${APR_LIBRARIES}")
+MESSAGE(STATUS "  OpenSSL include directory ....... : ${OPENSSL_INCLUDE_DIR}")
+MESSAGE(STATUS "  OpenSSL libraries ............... : ${OPENSSL_LIBRARIES}")
 MESSAGE(STATUS "  PCRE include directory .......... : ${PCRE_INCLUDE_DIR}")
 MESSAGE(STATUS "  PCRE libraries .................. : ${PCRE_LIBRARIES}")
 MESSAGE(STATUS "  libxml2 iconv prereq include dir. : ${LIBXML2_ICONV_INCLUDE_DIR}")
 MESSAGE(STATUS "  libxml2 iconv prereq libraries .. : ${LIBXML2_ICONV_LIBRARIES}")
-MESSAGE(STATUS "  Extra include directories ....... : ${EXTRA_INCLUDE_DIRS}")
+MESSAGE(STATUS "  Extra include directories ....... : ${EXTRA_INCLUDES}")
+MESSAGE(STATUS "  Extra compile flags ............. : ${EXTRA_COMPILE_FLAGS}")
+MESSAGE(STATUS "  Extra libraries ................. : ${EXTRA_LIBS}")
 
 MESSAGE(STATUS "  Modules built and loaded:")
 FOREACH(mod ${mods_built_and_loaded})