From: Kefu Chai <kchai@redhat.com>
Date: Sat, 28 May 2016 16:22:31 +0000 (+0800)
Subject: cmake: libradosstriper's OUTPUT_NAME should be radosstriper
X-Git-Tag: v11.0.0~358^2~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8588e3d55e0ff37d98e2a315791fc9bdc4173bfa;p=ceph.git

cmake: libradosstriper's OUTPUT_NAME should be radosstriper

and s/libradosstriper/radosstriper/ otherwise the created .so
filename would be liblibradosstriper.so with the default prefix.

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7f9cd07c7402..793eabb28f0f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -605,7 +605,7 @@ set(rados_srcs
   tools/rados/PoolDump.cc
   common/obj_bencher.cc)
 add_executable(rados ${rados_srcs})
-target_link_libraries(rados librados global ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} libradosstriper)
+target_link_libraries(rados librados global ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} radosstriper)
 
 if (WITH_CEPHFS)
   set(cephfs_journal_tool_srcs
diff --git a/src/libradosstriper/CMakeLists.txt b/src/libradosstriper/CMakeLists.txt
index 5e385c7e6118..fa8f1b23642e 100644
--- a/src/libradosstriper/CMakeLists.txt
+++ b/src/libradosstriper/CMakeLists.txt
@@ -2,8 +2,11 @@ set(libradosstriper_srcs
   libradosstriper.cc
   RadosStriperImpl.cc
   MultiAioCompletionImpl.cc)
-add_library(libradosstriper ${libradosstriper_srcs})
-target_link_libraries(libradosstriper librados cls_lock_client osdc common pthread ${CRYPTO_LIBS} ${EXTRALIBS}) 
-set_target_properties(libradosstriper PROPERTIES OUPUT_NAME libradosstriper VERSION "1.0.0" SOVERSION "1")
+add_library(radosstriper ${libradosstriper_srcs})
+target_link_libraries(radosstriper librados cls_lock_client osdc common pthread ${CRYPTO_LIBS} ${EXTRALIBS})
+set_target_properties(radosstriper PROPERTIES
+  OUPUT_NAME radosstriper
+  VERSION "1.0.0"
+  SOVERSION "1")
 
-install(TARGETS libradosstriper DESTINATION lib)
+install(TARGETS radosstriper DESTINATION lib)
diff --git a/src/test/libradosstriper/CMakeLists.txt b/src/test/libradosstriper/CMakeLists.txt
index 0c16689472b7..f633b7340518 100644
--- a/src/test/libradosstriper/CMakeLists.txt
+++ b/src/test/libradosstriper/CMakeLists.txt
@@ -6,7 +6,7 @@ set_target_properties(rados_striper_test PROPERTIES COMPILE_FLAGS
 add_executable(ceph_test_rados_api_striping
   striping.cc
   )
-target_link_libraries(ceph_test_rados_api_striping librados libradosstriper 
+target_link_libraries(ceph_test_rados_api_striping librados radosstriper
   ${UNITTEST_LIBS} rados_striper_test)
 set_target_properties(ceph_test_rados_api_striping PROPERTIES COMPILE_FLAGS
   ${UNITTEST_CXX_FLAGS})