Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

cmake: Really add FCGI_INCLUDE_DIR to include_directories for rgw #10139

Merged
merged 1 commit into from Jul 7, 2016
Merged

cmake: Really add FCGI_INCLUDE_DIR to include_directories for rgw #10139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions src/CMakeLists.txt
View file
Open in desktop
Expand Up @@ -1429,6 +1429,7 @@ if(${WITH_RADOSGW})
endif(HAVE_SSL)

add_library(rgw_a STATIC ${rgw_a_srcs})
target_include_directories(rgw_a PUBLIC ${FCGI_INCLUDE_DIR})
Copy link
Contributor

@tchaikov tchaikov Jul 7, 2016 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@tserong, have you tried to change PUBLIC here to PRIVATE? if it fails the build, we should have PUBLIC for sure.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I just did a rebuild with that line changed from PUBLIC to PRIVATE, and it failed, so I think that one needs to remain as-is.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@tserong thanks for testing!

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})
Expand Down
2 changes: 0 additions & 2 deletions src/rgw/CMakeLists.txt
View file
Open in desktop
@@ -1,5 +1,3 @@
include_directories(${FCGI_INCLUDE_DIR})

add_executable(ceph_rgw_jsonparser
rgw_jsonparser.cc
rgw_common.cc
Expand Down
1 change: 0 additions & 1 deletion src/rgw/rgw_fcgi.cc
View file
Open in desktop
Expand Up @@ -4,7 +4,6 @@
#include "rgw_fcgi.h"

#include "acconfig.h"
#include <fcgiapp.h>

int RGWFCGX::write_data(const char *buf, int len)
{
Expand Down
2 changes: 2 additions & 0 deletions src/test/CMakeLists.txt
View file
Open in desktop
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down