]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
cmake: remove Beast submodule and include path
authorCasey Bodley <cbodley@redhat.com>
Tue, 19 Dec 2017 03:23:53 +0000 (22:23 -0500)
committerCasey Bodley <cbodley@redhat.com>
Mon, 8 Jan 2018 21:41:50 +0000 (16:41 -0500)
the beast library is included in boost 1.66

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit d85f42dd697365ad6c6be80af2e31a6415f55d5e)

Conflicts:
src/rgw/CMakeLists.txt (missing SYSTEM flag from
                 https://github.com/ceph/ceph/pull/18711)

.gitmodules
src/Beast [deleted submodule]
src/rgw/CMakeLists.txt

index f2cafd8924672289aa8c0eea1d481a0656edd35d..5f77912f0d170a9b22dbc19e7237c33e11cbafe3 100644 (file)
@@ -37,9 +37,6 @@
        url = https://github.com/ceph/lua.git
        branch = lua-5.3-ceph
        ignore = dirty
-[submodule "src/Beast"]
-       path = src/Beast
-       url = https://github.com/ceph/Beast.git
 [submodule "src/dpdk"]
        path = src/dpdk
        url = https://github.com/ceph/dpdk
diff --git a/src/Beast b/src/Beast
deleted file mode 160000 (submodule)
index 3fbbf22..0000000
--- a/src/Beast
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 3fbbf22ed7fa47da2a1e0b6c96565c75d73a310c
index 2ed3d451b311b6c7006c63496ea68370234d421f..3f4a7cd97f91e90238dd0706b787e375b5507ec7 100644 (file)
@@ -141,7 +141,6 @@ add_library(rgw_a STATIC ${rgw_a_srcs})
 add_dependencies(rgw_a civetweb_h)
 
 target_include_directories(rgw_a PUBLIC
-  "../Beast/include"
   ${FCGI_INCLUDE_DIR}
   "../rapidjson/include"
   )