From: David Disseldorp Date: Mon, 13 Feb 2017 14:03:42 +0000 (+0100) Subject: rgw: set FCGI_INCLUDE_DIR for cephd_rgw_base X-Git-Tag: v12.0.1~429^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3e55db45f917869629cf9590ab557c0afe21a708;p=ceph.git rgw: set FCGI_INCLUDE_DIR for cephd_rgw_base 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 --- diff --git a/src/rgw/CMakeLists.txt b/src/rgw/CMakeLists.txt index 461735082d6d7..4a06cf371d747 100644 --- a/src/rgw/CMakeLists.txt +++ b/src/rgw/CMakeLists.txt @@ -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})