CMake: make mon and osd depend on EC plugins

...because the services won't start if their
git version stamps don't match those of the
plugins.  This is for the benefit of developers,
so that we can do "make ceph-mon" and get a
vstart-able result.

Signed-off-by: John Spray <john.spray@redhat.com>

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 62c335f277d863799cf6439446072497468e6301..44cb4a43183aa71b640e162c84f76718400c7e46 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -554,6 +554,7 @@ set(ceph_mon_srcs
   ceph_mon.cc
   common/TextTable.cc)
 add_executable(ceph-mon ${ceph_mon_srcs} $<TARGET_OBJECTS:heap_profiler_objs>)
+add_dependencies(ceph-mon erasure_code_plugins)
 target_link_libraries(ceph-mon mon boost_thread common os global ${EXTRALIBS}
   ${CMAKE_DL_LIBS} ${TCMALLOC_LIBS})
 install(TARGETS ceph-mon DESTINATION bin)
@@ -641,6 +642,7 @@ set(ceph_osd_srcs
 add_executable(ceph-osd ${ceph_osd_srcs}
   $<TARGET_OBJECTS:heap_profiler_objs>
   $<TARGET_OBJECTS:common_util_obj>)
+add_dependencies(ceph-osd erasure_code_plugins)
 target_link_libraries(ceph-osd osd os global ${BLKID_LIBRARIES} ${TCMALLOC_LIBS})
 install(TARGETS ceph-osd DESTINATION bin)
 

diff --git a/src/erasure-code/CMakeLists.txt b/src/erasure-code/CMakeLists.txt
index 8bcba45b2767fa4f6fe5139170e13a2ac85a59e9..b65ffd20ed75f4cb733978093487ec2780271ad8 100644 (file)
--- a/src/erasure-code/CMakeLists.txt
+++ b/src/erasure-code/CMakeLists.txt
@@ -15,3 +15,10 @@ target_link_libraries(erasure_code dl)
 add_dependencies(erasure_code ${CMAKE_SOURCE_DIR}/src/ceph_ver.h)
 
 add_library(erasure_code_objs OBJECT ErasureCode.cc)
+
+add_custom_target(erasure_code_plugins DEPENDS
+    ec_isa
+    ec_lrc
+    ec_jerasure_sse3
+    ec_jerasure_sse4
+    ec_jerasure)