From: Ali Maredia <amaredia@redhat.com>
Date: Wed, 19 Aug 2015 20:15:46 +0000 (-0400)
Subject: cmake: Removed traces of CDS, minor cmake fixes
X-Git-Tag: v9.1.0~227^2~1^2~10
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=283e81c215d270e641ca66497d78cfd1f3adc3da;p=ceph.git

cmake: Removed traces of CDS, minor cmake fixes

Signed-off-by: Ali Maredia <amaredia@redhat.com>
---

diff --git a/cmake/modules/Findcds.cmake b/cmake/modules/Findcds.cmake
deleted file mode 100644
index b22dc025b9de..000000000000
--- a/cmake/modules/Findcds.cmake
+++ /dev/null
@@ -1,37 +0,0 @@
-# - Find cds
-#
-# CDS_INCLUDE_DIR - where to find cds/init.h
-# FIO_FOUND - True if found.
-
-find_path(CDS_INC_DIR cds/init.h NO_DEFAULT_PATH PATHS
-  /usr/include
-  /opt/local/include
-  /usr/local/include
-  /opt/cds
-)
-
-if (CDS_INC_DIR)
-  set(CDS_FOUND TRUE)
-else ()
-  set(CDS_FOUND FALSE)
-endif ()
-
-if (CDS_FOUND)
-  message(STATUS "Found cds: ${CDS_INC_DIR}")
-else ()
-  message(STATUS "Failed to find cds/init.h")
-  if (CDS_FIND_REQUIRED)
-    message(FATAL_ERROR "Missing required cds/init.h")
-  endif ()
-endif ()
-
-find_library(CDS_LIBS 
-  NAMES cds
-  PATHS /usr/lib /usr/lib/x86_64-linux-gnu /opt/cds/bin/gcc-amd64-linux-64
-)
-
-mark_as_advanced(
-  CDS_INC_DIR
-  CDS_LIBS
-)
-
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index dd7852246346..6cb44c613b69 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -75,10 +75,6 @@ if(${WITH_PROFILER})
   list(APPEND EXTRALIBS profiler)
 endif(${WITH_PROFILER})
 
-if(WITH_CDS)
-  list(APPEND EXTRALIBS ${CDS_LIBS})
-endif(WITH_CDS)
-
 if(USE_NSS)
   if(NSS_FOUND)
     if(NSPR_FOUND)
diff --git a/src/erasure-code/CMakeLists.txt b/src/erasure-code/CMakeLists.txt
index 8bcba45b2767..60112930fa35 100644
--- a/src/erasure-code/CMakeLists.txt
+++ b/src/erasure-code/CMakeLists.txt
@@ -6,9 +6,10 @@ add_subdirectory(jerasure)
 add_subdirectory(lrc)
 add_subdirectory(shec)
 
-if (HAVE_BETTER_YASM_ELF64)
-  add_subdirectory(isa)
-endif (HAVE_BETTER_YASM_ELF64)
+#TODO: Understand and fix this conditional
+#if (HAVE_BETTER_YASM_ELF64)
+#  add_subdirectory(isa)
+#endif (HAVE_BETTER_YASM_ELF64)
 
 add_library(erasure_code ErasureCodePlugin.cc)
 target_link_libraries(erasure_code dl)
diff --git a/src/include/config-h.in.cmake b/src/include/config-h.in.cmake
index fbd2e634178c..84514915e510 100644
--- a/src/include/config-h.in.cmake
+++ b/src/include/config-h.in.cmake
@@ -232,7 +232,4 @@
 /* Defined if XIO */
 #cmakedefine HAVE_XIO
 
-/* Defined if CDS */
-#cmakedefine HAVE_CDS
-
 #endif /* CONFIG_H */
diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
index 0e8189482547..6dfe56f055c2 100644
--- a/src/test/CMakeLists.txt
+++ b/src/test/CMakeLists.txt
@@ -850,24 +850,6 @@ target_link_libraries(unittest_escape global ${CMAKE_DL_LIBS} ${TCMALLOC_LIBS}
 set_target_properties(unittest_escape PROPERTIES COMPILE_FLAGS
   ${UNITTEST_CXX_FLAGS})
 
-# unittest_chain_xattr
-set(unittest_chain_xattr_srcs
-  objectstore/chain_xattr.cc
-  )
-add_executable(unittest_chain_xattr
-  ${unittest_chain_xattr_srcs}
-  $<TARGET_OBJECTS:heap_profiler_objs>
-  )
-set_target_properties(unittest_chain_xattr PROPERTIES COMPILE_FLAGS
-  ${UNITTEST_CXX_FLAGS})
-target_link_libraries(unittest_chain_xattr
-  os
-  global
-  ${CMAKE_DL_LIBS}
-  ${TCMALLOC_LIBS}
-  ${UNITTEST_LIBS}
-  )
-
 # unittest_strtol
 add_executable(unittest_strtol EXCLUDE_FROM_ALL
   strtol.cc
@@ -932,22 +914,7 @@ target_link_libraries(unittest_chain_xattr
   ${TCMALLOC_LIBS}
   ${UNITTEST_LIBS}
   )
-
-# unittest_flatindex
-add_executable(unittest_flatindex EXCLUDE_FROM_ALL
-  os/TestFlatIndex.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
-  )
-add_test(unittest_flatindex unittest_flatindex)
-add_dependencies(check unittest_flatindex)
-target_link_libraries(unittest_flatindex
-  os
-  global
-  ${CMAKE_DL_LIBS}
-  ${TCMALLOC_LIBS}
-  ${UNITTEST_LIBS}
-  )
-set_target_properties(unittest_flatindex PROPERTIES COMPILE_FLAGS
+set_target_properties(unittest_chain_xattr PROPERTIES COMPILE_FLAGS
   ${UNITTEST_CXX_FLAGS})
 
 # unittest_safe_io