diff options
| author | Jeff Trawick <trawick@apache.org> | 2014-04-22 02:05:05 +0200 |
|---|---|---|
| committer | Jeff Trawick <trawick@apache.org> | 2014-04-22 02:05:05 +0200 |
| commit | 828ae2e71ad8b9ddc1b6648d4683caf0ef5d2518 (patch) | |
| tree | a65ebf267a4947fce3ddd5f1b482cd60e3f68a78 /CMakeLists.txt | |
| parent | back to c89 (diff) | |
| download | apache2-828ae2e71ad8b9ddc1b6648d4683caf0ef5d2518.tar.xz apache2-828ae2e71ad8b9ddc1b6648d4683caf0ef5d2518.zip | |
follow-up to r1588987:
Support build of mod_ssl_ct on Windows
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1589009 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index d93f9a070d..ba6f1d0c2b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -158,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 "") @@ -308,6 +320,7 @@ 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" @@ -425,6 +438,16 @@ 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) @@ -845,6 +868,7 @@ INSTALL(DIRECTORY include/ DESTINATION include 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) |