]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
applied mod_proxy_http2 related cmake biuld changes as proposed by Evgeny Kotkov
authorStefan Eissing <icing@apache.org>
Thu, 12 May 2016 15:04:18 +0000 (15:04 +0000)
committerStefan Eissing <icing@apache.org>
Thu, 12 May 2016 15:04:18 +0000 (15:04 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1743512 13f79535-47bb-0310-9956-ffa450edef68

CMakeLists.txt

index d7176357677c1e8399126e992ecb462001b6b925..5aa6dc7d0e5515802ffb40e4dfac9b9ef33b615a 100644 (file)
@@ -396,6 +396,7 @@ SET(mod_firehose_requires            SOMEONE_TO_MAKE_IT_COMPILE_ON_WINDOWS)
 SET(mod_heartbeat_extra_libs         mod_watchdog)
 SET(mod_http2_requires               NGHTTP2_FOUND)
 SET(mod_http2_extra_defines          ssize_t=long)
+SET(mod_http2_extra_includes         ${NGHTTP2_INCLUDE_DIR})
 SET(mod_http2_extra_libs             ${NGHTTP2_LIBRARIES})
 SET(mod_http2_extra_sources
   modules/http2/h2_alt_svc.c         modules/http2/h2_bucket_eoc.c
@@ -451,11 +452,11 @@ SET(mod_proxy_scgi_extra_libs        mod_proxy)
 SET(mod_proxy_wstunnel_extra_libs    mod_proxy)
 SET(mod_proxy_http2_requires               NGHTTP2_FOUND)
 SET(mod_proxy_http2_extra_defines          ssize_t=long)
-SET(mod_proxy_http2_extra_libs             ${NGHTTP2_LIBRARIES})
+SET(mod_proxy_http2_extra_includes         ${NGHTTP2_INCLUDE_DIR})
+SET(mod_proxy_http2_extra_libs             ${NGHTTP2_LIBRARIES} mod_proxy)
 SET(mod_proxy_http2_extra_sources
   modules/http2/h2_proxy_session.c   modules/http2/h2_util.c
 )
-SET(mod_proxy_http2_extra_libs       mod_proxy)
 SET(mod_ratelimit_extra_defines      AP_RL_DECLARE_EXPORT)
 SET(mod_sed_extra_sources
   modules/filters/regexp.c           modules/filters/sed0.c