Modify CMakeLists.txt files so dmclock is built, testing is

integrated, and gtest files available to libraries.

Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>

src/CMakeLists.txt

@@ -330,6 +330,17 @@ add_subdirectory(json_spirit)
 
 include_directories("${CMAKE_SOURCE_DIR}/src/xxHash")
 
+set(GMOCK_INCLUDE_DIRS
+  "${CMAKE_SOURCE_DIR}/src/googletest/googletest/include/gmock")
+set(GTEST_INCLUDE_DIRS
+  "${CMAKE_SOURCE_DIR}/src/googletest/googletest/include/gtest")
+
+include_directories("${CMAKE_SOURCE_DIR}/src/dmclock/src")
+include_directories("${CMAKE_SOURCE_DIR}/src/dmclock/support/src")
+
+# needed for source files that friend unit tests (e.g., using FRIEND_TEST)
+include_directories("${CMAKE_SOURCE_DIR}/src/googletest/googletest/include")
+
 set(xio_common_srcs)
 if(HAVE_XIO)
   list(APPEND xio_common_srcs
@@ -804,6 +815,7 @@ set(cls_references_files objclass/class_api.cc)
 add_library(cls_references_objs OBJECT ${cls_references_files})
 
 add_subdirectory(osd)
+
 set(ceph_osd_srcs
   ceph_osd.cc)
 add_executable(ceph-osd ${ceph_osd_srcs}
@@ -835,6 +847,18 @@ endif(WITH_TESTS)
 
 add_subdirectory(compressor)
 add_subdirectory(tools)
+add_subdirectory(dmclock) # after gmock
+
+add_dependencies(tests
+  dmclock-tests dmclock-data-struct-tests)
+
+if(WITH_TESTS)
+install(PROGRAMS
+  ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/dmclock-tests
+  ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/data-struct-tests
+  DESTINATION bin)
+endif(WITH_TESTS)
+
 
 if(WITH_TESTS)
 configure_file(${CMAKE_SOURCE_DIR}/src/ceph-coverage.in