]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
cmake: Add FCGI_INCLUDE_DIR to include_directories for rgw
authorTim Serong <tserong@suse.com>
Tue, 28 Jun 2016 11:51:32 +0000 (21:51 +1000)
committerTim Serong <tserong@suse.com>
Tue, 28 Jun 2016 13:21:17 +0000 (23:21 +1000)
commit3cf6c534ff04e781f8f768138a600f59fc89730b
tree5d0211849f2123bac348bb2819b990dae7dfedda
parent5de4a9cef6d914f41a35f02fbcd55c05fd705e7a
cmake: Add FCGI_INCLUDE_DIR to include_directories for rgw

rgw_fcgi.{cc,h} includes either "fastcgi/fcgiapp.h" or "fcgiapp.h",
depending on whether FASTCGI_INCLUDE_DIR is set.  That define is set by
autotools, but cmake builds work a little differently -- in the cmake
case, FCGI_INCLUDE_DIR is set by Findfcgi.cmake, provided it can find
the fastcgi headers *somewhere*.  This means the cmake build breaks on
SUSE distros (and presumably others) which use "fastcgi/fcgiapp.h",
because FASTCGI_INCLUDE_DIR isn't set, so it tries to include
"fcgiapp.h", and fails.

This change adds FCGI_INCLUDE_DIR to the include directories, and tries
to #include <fcgiapp.h> if FASTCGI_INCLUDE_DIR is not set, which should
work for both cmake and autotools builds.

(It would probably be cleanest to fix autotools to behave like cmake,
then the #ifdef/#else stuff can be dropped, and we could just always
include <fcgiapp.h>)

Signed-off-by: Tim Serong <tserong@suse.com>
src/rgw/CMakeLists.txt
src/rgw/rgw_fcgi.cc
src/rgw/rgw_fcgi.h