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: replace civetweb symlink w/file copy #11900

Merged
merged 1 commit into from Nov 10, 2016
Merged

cmake: replace civetweb symlink w/file copy #11900

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
6 changes: 0 additions & 6 deletions CMakeLists.txt
View file
Open in desktop
Expand Up @@ -387,12 +387,6 @@ option(DEBUG_GATHER "C_Gather debugging is enabled" ON)
option(HAVE_LIBZFS "LibZFS is enabled" OFF)
option(ENABLE_COVERAGE "Coverage is enabled" OFF)
option(PG_DEBUG_REFS "PG Ref debugging is enabled" OFF)
# we want to include civetweb.h as "civetweb/civetweb.h". Make it so.
execute_process(
COMMAND rm -f "${CMAKE_BINARY_DIR}/src/include/civetweb"
COMMAND mkdir -p "${CMAKE_BINARY_DIR}/src/include"
COMMAND ln -s "${CMAKE_SOURCE_DIR}/src/civetweb/include"
"${CMAKE_BINARY_DIR}/src/include/civetweb")

option(WITH_TESTS "enable the build of ceph-test package scripts/binaries" ON)

Expand Down
6 changes: 6 additions & 0 deletions src/rgw/CMakeLists.txt
View file
Open in desktop
Expand Up @@ -100,6 +100,12 @@ target_include_directories(rgw_a PUBLIC
"../Beast/include"
${FCGI_INCLUDE_DIR})

# we want to include civetweb.h as "civetweb/civetweb.h". Make it so.
file(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/src/include/civetweb")
file(COPY
"${CMAKE_SOURCE_DIR}/src/civetweb/include/civetweb.h"
DESTINATION "${CMAKE_BINARY_DIR}/src/include/civetweb")

target_link_libraries(rgw_a librados cls_lock_client 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 common common_utf8 global
Expand Down