RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-18 01:16:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

rgw: set FCGI_INCLUDE_DIR for cephd_rgw_base

Browse Source 
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>
This commit is contained in:
David Disseldorp 2017-02-13 15:03:42 +01:00
parent 877c938937
commit 3e55db45f9
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/rgw/CMakeLists.txt
View 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})