Merge pull request #10139 from SUSE/wip-cmake-really-fix-fcgi-include…

…-dir cmake: Really add FCGI_INCLUDE_DIR to include_directories for rgw Reviewed-by: Kefu Chai <kchai@redhat.com>
ceph · Jul 7, 2016 · 0250214 · 0250214
2 parents fb7a1ed + 234b066
commit 0250214
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 3 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -1402,6 +1402,7 @@ if(${WITH_RADOSGW})
   endif(HAVE_SSL)
 
   add_library(rgw_a STATIC ${rgw_a_srcs})
+  target_include_directories(rgw_a PUBLIC ${FCGI_INCLUDE_DIR})
   target_link_libraries(rgw_a librados cls_rgw_client cls_refcount_client
     cls_log_client cls_statelog_client cls_timeindex_client cls_version_client
     cls_replica_log_client cls_user_client curl global expat ${OPENLDAP_LIBS})

diff --git a/src/rgw/CMakeLists.txt b/src/rgw/CMakeLists.txt
@@ -1,5 +1,3 @@
-include_directories(${FCGI_INCLUDE_DIR})
-
 add_executable(ceph_rgw_jsonparser
   rgw_jsonparser.cc
   rgw_common.cc

diff --git a/src/rgw/rgw_fcgi.cc b/src/rgw/rgw_fcgi.cc
@@ -4,7 +4,6 @@
 #include "rgw_fcgi.h"
 
 #include "acconfig.h"
-#include <fcgiapp.h>
 
 int RGWFCGX::write_data(const char *buf, int len)
 {

diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
@@ -254,6 +254,7 @@ add_executable(ceph_test_librgw_file
   )
 set_target_properties(ceph_test_librgw_file PROPERTIES COMPILE_FLAGS
   ${UNITTEST_CXX_FLAGS})
+target_include_directories(ceph_test_librgw_file PRIVATE ${FCGI_INCLUDE_DIR})
 target_link_libraries(ceph_test_librgw_file
   rgw
   librados
@@ -293,6 +294,7 @@ add_executable(ceph_test_librgw_file_nfsns
   )
 set_target_properties(ceph_test_librgw_file_nfsns PROPERTIES COMPILE_FLAGS
   ${UNITTEST_CXX_FLAGS})
+target_include_directories(ceph_test_librgw_file_nfsns PRIVATE ${FCGI_INCLUDE_DIR})
 target_link_libraries(ceph_test_librgw_file_nfsns
   rgw
   librados