]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: set FCGI_INCLUDE_DIR for cephd_rgw_base 13393/head
authorDavid Disseldorp <ddiss@suse.de>
Mon, 13 Feb 2017 14:03:42 +0000 (15:03 +0100)
committerDavid Disseldorp <ddiss@suse.de>
Mon, 13 Feb 2017 14:03:42 +0000 (15:03 +0100)
cephd_rgw_base build currently fails with fastcgi enabled:
--
In file included from /home/david/ceph/src/rgw/rgw_request.h:13:0,
from /home/david/ceph/src/rgw/rgw_main.cc:53:
/home/david/ceph/src/rgw/rgw_fcgi.h:8:21: fatal error: fcgiapp.h:
No such file or directory
^
--

This is despite the fact that fastcgi was detected and located at
configure time:
build/CMakeCache.txt:FCGI_INCLUDE_DIR:PATH=/usr/include/fastcgi

Fix this by ensuring that the cephd_rgw_base build target correctly uses
FCGI_INCLUDE_DIR.

Fixes: http://tracker.ceph.com/issues/18918
Signed-off-by: David Disseldorp <ddiss@suse.de>
src/rgw/CMakeLists.txt

index 461735082d6d7780e9ee2308bc83ea26df07c320..4a06cf371d74758b1719a5436d0aa29abda5caad 100644 (file)
@@ -212,6 +212,7 @@ install(TARGETS rgw DESTINATION ${CMAKE_INSTALL_LIBDIR})
 if(WITH_EMBEDDED)
   include(MergeStaticLibraries)
   add_library(cephd_rgw_base STATIC rgw_main.cc ${radosgw_admin_srcs})
+  target_include_directories(cephd_rgw_base PUBLIC ${FCGI_INCLUDE_DIR})
   set_target_properties(cephd_rgw_base PROPERTIES COMPILE_DEFINITIONS BUILDING_FOR_EMBEDDED)
   merge_static_libraries(cephd_rgw cephd_rgw_base rgw_a radosgw_a)
   target_link_libraries(cephd_rgw ${FCGI_LIBRARY})