RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-18 17:37:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #22077 from majianpeng/config-w/o-mgr

Browse Source 
cmake: make -DWITH_MGR=OFF work.

Reviewed-by: Kefu Chai <kchai@redhat.com>
This commit is contained in:
Kefu Chai 2018-05-22 10:43:10 +08:00 committed by GitHub
commit 6b48184f4c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/CMakeLists.txt
View File

@ -1124,7 +1124,7 @@ if(WITH_LTTNG)
add_dependencies(vstart tracepoint_libraries)
endif(WITH_LTTNG)
if(WITH_MGR_DASHBOARD_FRONTEND AND CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64|amd64")
if(WITH_MGR AND WITH_MGR_DASHBOARD_FRONTEND AND CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64|amd64")
add_dependencies(vstart mgr-dashboard-frontend-build)
endif()

4
src/test/CMakeLists.txt
View File

@ -520,7 +520,6 @@ install(TARGETS
#following dependencies are run inside make check unit tests
add_dependencies(tests
ceph-mon
ceph-mgr
ceph-authtool
get_command_descriptions
crushtool
@ -542,6 +541,9 @@ add_dependencies(tests
ceph_erasure_code
ceph-disk
cython_modules)
if(WITH_MGR)
add_dependencies(tests ceph-mgr)
endif()
if(WITH_RBD)
add_dependencies(tests unittest_librbd rbd)
if(FREEBSD)