From: John Spray <john.spray@redhat.com>
Date: Tue, 13 Oct 2015 13:40:27 +0000 (+0100)
Subject: CMake: make mon and osd depend on EC plugins
X-Git-Tag: v10.0.0~98^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e6c7eb76a49500ff6b4b0bbbbf17baaf0bf71f4a;p=ceph.git

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 62c335f277d..44cb4a43183 100644
--- 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 8bcba45b276..b65ffd20ed7 100644
--- 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)