blob: 0742945c0184a17bb110a2e445fb844f86373646 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
|
commit 41c1cee88b38bc43002b232ede42dc157364f61a
Author: Casey Bodley <cbodley@redhat.com>
Date: Fri Nov 1 16:04:37 2019 -0400
cmake: define mgr_cap_obj library when WITH_MGR=OFF
resolves the cmake error when WITH_MGR=OFF:
Error evaluating generator expression:
$<TARGET_OBJECTS:mgr_cap_obj>
Objects of target "mgr_cap_obj" referenced but no such target exists.
Call Stack (most recent call first):
src/mon/CMakeLists.txt:34 (add_library)
Signed-off-by: Casey Bodley <cbodley@redhat.com>
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 275a8ebd17..c2a9d7a669 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -473,9 +473,7 @@ if(WITH_LIBRADOSSTRIPER)
add_subdirectory(libradosstriper)
endif()
-if(WITH_MGR)
- add_subdirectory(mgr)
-endif()
+add_subdirectory(mgr)
set(librados_config_srcs
librados-config.cc)
diff --git a/src/mgr/CMakeLists.txt b/src/mgr/CMakeLists.txt
index 79227bcc1d..e69335eb69 100644
--- a/src/mgr/CMakeLists.txt
+++ b/src/mgr/CMakeLists.txt
@@ -1,37 +1,39 @@
add_library(mgr_cap_obj OBJECT
MgrCap.cc)
-set(mgr_srcs
- ${CMAKE_SOURCE_DIR}/src/ceph_mgr.cc
- ${CMAKE_SOURCE_DIR}/src/mon/PGMap.cc
- ActivePyModule.cc
- ActivePyModules.cc
- BaseMgrModule.cc
- BaseMgrStandbyModule.cc
- ClusterState.cc
- DaemonHealthMetricCollector.cc
- DaemonServer.cc
- DaemonState.cc
- Gil.cc
- Mgr.cc
- MgrStandby.cc
- OSDPerfMetricTypes.cc
- OSDPerfMetricCollector.cc
- PyFormatter.cc
- PyModule.cc
- PyModuleRegistry.cc
- PyModuleRunner.cc
- PyOSDMap.cc
- StandbyPyModules.cc
- mgr_commands.cc
- $<TARGET_OBJECTS:mgr_cap_obj>)
-add_executable(ceph-mgr ${mgr_srcs})
-target_include_directories(ceph-mgr SYSTEM PRIVATE "${PYTHON_INCLUDE_DIRS}")
-target_link_libraries(ceph-mgr
- osdc client heap_profiler
- global-static ceph-common
- Boost::python${MGR_PYTHON_VERSION_MAJOR}${MGR_PYTHON_VERSION_MINOR}
- ${MGR_PYTHON_LIBRARIES} ${CMAKE_DL_LIBS} ${GSSAPI_LIBRARIES})
-set_target_properties(ceph-mgr PROPERTIES
- POSITION_INDEPENDENT_CODE ${EXE_LINKER_USE_PIE})
-install(TARGETS ceph-mgr DESTINATION bin)
+if(WITH_MGR)
+ set(mgr_srcs
+ ${CMAKE_SOURCE_DIR}/src/ceph_mgr.cc
+ ${CMAKE_SOURCE_DIR}/src/mon/PGMap.cc
+ ActivePyModule.cc
+ ActivePyModules.cc
+ BaseMgrModule.cc
+ BaseMgrStandbyModule.cc
+ ClusterState.cc
+ DaemonHealthMetricCollector.cc
+ DaemonServer.cc
+ DaemonState.cc
+ Gil.cc
+ Mgr.cc
+ MgrStandby.cc
+ OSDPerfMetricTypes.cc
+ OSDPerfMetricCollector.cc
+ PyFormatter.cc
+ PyModule.cc
+ PyModuleRegistry.cc
+ PyModuleRunner.cc
+ PyOSDMap.cc
+ StandbyPyModules.cc
+ mgr_commands.cc
+ $<TARGET_OBJECTS:mgr_cap_obj>)
+ add_executable(ceph-mgr ${mgr_srcs})
+ target_include_directories(ceph-mgr SYSTEM PRIVATE "${PYTHON_INCLUDE_DIRS}")
+ target_link_libraries(ceph-mgr
+ osdc client heap_profiler
+ global-static ceph-common
+ Boost::python${MGR_PYTHON_VERSION_MAJOR}${MGR_PYTHON_VERSION_MINOR}
+ ${MGR_PYTHON_LIBRARIES} ${CMAKE_DL_LIBS} ${GSSAPI_LIBRARIES})
+ set_target_properties(ceph-mgr PROPERTIES
+ POSITION_INDEPENDENT_CODE ${EXE_LINKER_USE_PIE})
+ install(TARGETS ceph-mgr DESTINATION bin)
+endif()
|
