diff options
| author | Matt Benjamin <mbenjamin@redhat.com> | 2016-11-10 20:27:56 +0100 |
|---|---|---|
| committer | Matt Benjamin <mbenjamin@redhat.com> | 2016-11-10 20:44:27 +0100 |
| commit | d9e5ad5e929cb1d23ce1f98b8c1edf8f010964f2 (patch) | |
| tree | 575876f7283c4847fa213f404f3b502995e733c3 /src/rgw/CMakeLists.txt | |
| parent | Merge pull request #11889 from trociny/wip-vstart-bashism (diff) | |
| download | ceph-d9e5ad5e929cb1d23ce1f98b8c1edf8f010964f2.tar.xz ceph-d9e5ad5e929cb1d23ce1f98b8c1edf8f010964f2.zip | |
cmake: replace civetweb symlink w/file copy
Intended to remove an apparent race. The two effects are
1. replace top-level command callouts w/file builtins
2. do them in the src/rgw sub-cmake
This is cleaner, and ideally avoids the race.
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
Diffstat (limited to 'src/rgw/CMakeLists.txt')
| -rw-r--r-- | src/rgw/CMakeLists.txt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/rgw/CMakeLists.txt b/src/rgw/CMakeLists.txt index bc70a83dffb..9bd18611796 100644 --- a/src/rgw/CMakeLists.txt +++ b/src/rgw/CMakeLists.txt @@ -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 |