Squashed 'src/dmclock/' changes from d6586d7..a26d29e

a26d29e Modify cmake files to match naming of cmake's upstream gtest and ceph's boost.
e23e63f Reorganize CMakeLists.txt files, so that projects that incorporate dmclock can control whether add_test is called. Now, add_test is called only at the top-level. Projects that incorporate dmclock can use add_subdirectory on subdirectories beneath the top-level to selective exactly what is included.

git-subtree-dir: src/dmclock
git-subtree-split: a26d29ef46ef8fbd5512a1f36637af7d3099c307

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 428863dc496df44f3adb733b75e5af564a25dd43..9444ea1e96afd0a27250d6d989a0b41f797cdcd2 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,32 +1,25 @@
 cmake_minimum_required(VERSION 2.8.11)
 
-set(CMAKE_CXX_FLAGS "-std=c++11 -Wno-write-strings ${CMAKE_CXX_FLAGS}")
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake/modules")
 
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/modules/")
-
-if(DO_NOT_DELAY_TAG_CALC)
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DDO_NOT_DELAY_TAG_CALC")
-endif()
-
-if(K_WAY_HEAP)
-  if(K_WAY_HEAP LESS 2)
-    message(FATAL_ERROR "K_WAY_HEAP value should be at least 2")
-  else()
-    set(CMAKE_CXX_SIM_FLAGS "-DK_WAY_HEAP=${K_WAY_HEAP}")
+if (NOT(TARGET gtest AND TARGET gtest_main))
+  if(NOT(GTEST_FOUND))
+    find_package(GTest REQUIRED)
   endif()
 endif()
 
-if (NOT(TARGET gtest AND TARGET gtest_main))
-  find_package(gtest REQUIRED)
-  include_directories(${GTEST_INCLUDE_DIRS})
+if (NOT(BOOST_FOUND))
+  find_package(Boost REQUIRED)
 endif()
 
-find_package(Boost REQUIRED)
-include_directories(${Boost_INCLUDE_DIRS})
-
+# add_subdirectory(support/src)
 add_subdirectory(src)
 add_subdirectory(sim)
-add_subdirectory(support)
 
 enable_testing()
 add_subdirectory(test)
+add_subdirectory(support/test)
+add_test(NAME dmclock-tests
+  COMMAND $<TARGET_FILE:dmclock-tests>)
+add_test(NAME dmclock-data-struct-tests
+  COMMAND $<TARGET_FILE:dmclock-data-struct-tests>)

diff --git a/cmake/modules/FindBoost.cmake b/cmake/modules/FindBoost.cmake
new file mode 100644 (file)
index 0000000..8feb317
--- /dev/null
+++ b/cmake/modules/FindBoost.cmake
@@ -0,0 +1,13 @@
+# - Find boost
+
+include(FindPackageHandleStandardArgs)
+
+find_path(Boost_INCLUDE_DIRS NAMES boost/variant.hpp
+    PATHS /usr/include /usr/local/include ${BOOST_DIR}/include)
+
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(boost
+  REQUIRED_VARS Boost_INCLUDE_DIRS)
+
+if(boost_FOUND)
+  set(BOOST_FOUND 1)
+endif()

diff --git a/cmake/modules/FindGTest.cmake b/cmake/modules/FindGTest.cmake
new file mode 100644 (file)
index 0000000..e6fe091
--- /dev/null
+++ b/cmake/modules/FindGTest.cmake
@@ -0,0 +1,50 @@
+# - Find gtest
+#
+#  GTEST_INCLUDE_DIRS   - where to find mcas/mcas.h, etc.
+#  GTEST_LIBRARIES      - List of libraries when using mcas.
+#  GTEST_MAIN_LIBRARIES - List of main libraries when using mcas.
+#  GTEST_FOUND          - True if mcas found.
+#
+#  GMOCK_INCLUDE_DIRS   - where to find mcas/mcas.h, etc.
+#  GMOCK_LIBRARIES      - List of libraries when using mcas.
+#  GMOCK_MAINLIBRARIES  - List of main libraries when using mcas.
+#  GMOCK_FOUND          - True if mcas found.
+
+
+include(FindPackageHandleStandardArgs)
+
+## GTEST
+
+find_path(GTEST_INCLUDE_DIRS NAMES gtest/gtest.h
+    PATHS /usr/include /usr/local/include)
+
+find_library(GTEST_LIBRARIES gtest
+  PATHS /usr/local/lib /usr/lib64)
+
+find_library(GTEST_MAIN_LIBRARIES gtest_main
+  PATHS /usr/local/lib /usr/lib64)
+
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(gtest
+  REQUIRED_VARS GTEST_LIBRARIES GTEST_MAIN_LIBRARIES GTEST_INCLUDE_DIRS)
+
+if(gtest_FOUND)
+  set(GTEST_FOUND 1)
+endif()
+
+## GMOCK
+
+find_path(GMOCK_INCLUDE_DIRS NAMES gmock/gmock.h
+    PATHS /usr/include /usr/local/include)
+
+find_library(GMOCK_LIBRARIES gmock
+  PATHS /usr/local/lib /usr/lib64)
+
+find_library(GMOCK_MAIN_LIBRARIES gmock_main
+  PATHS /usr/local/lib /usr/lib64)
+
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(gmock
+  REQUIRED_VARS GMOCK_LIBRARIES GMOCK_MAIN_LIBRARIES GMOCK_INCLUDE_DIRS)
+
+if(gmock_FOUND)
+  set(GMOCK_FOUND 1)
+endif()

diff --git a/cmake/modules/Findboost.cmake b/cmake/modules/Findboost.cmake
deleted file mode 100644 (file)
index 4f0dfd0..0000000
--- a/cmake/modules/Findboost.cmake
+++ /dev/null
@@ -1,15 +0,0 @@
-# - Find boost
-
-find_path(BOOST_INCLUDE_DIR NAMES boost/variant.hpp
-    PATHS /usr/include /usr/local/include ${BOOST_DIR}/include)
-
-include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(boost
-  REQUIRED_VARS BOOST_INCLUDE_DIR)
-
-if(boost_FOUND)
-  set(BOOST_FOUND 1)
-endif()
-if(BOOST_FOUND)
-  set(BOOST_INCLUDES ${BOOST_INCLUDE_DIR})
-endif()

diff --git a/cmake/modules/Findgtest.cmake b/cmake/modules/Findgtest.cmake
deleted file mode 100644 (file)
index bfe0980..0000000
--- a/cmake/modules/Findgtest.cmake
+++ /dev/null
@@ -1,48 +0,0 @@
-# - Find gtest
-#
-#  GTEST_INCLUDE_DIRS   - where to find mcas/mcas.h, etc.
-#  GTEST_LIBRARIES      - List of libraries when using mcas.
-#  GTEST_FOUND          - True if mcas found.
-#
-#  GMOCK_INCLUDE_DIRS   - where to find mcas/mcas.h, etc.
-#  GMOCK_LIBRARIES      - List of libraries when using mcas.
-#  GMOCK_FOUND          - True if mcas found.
-
-
-## GTEST
-
-find_path(GTEST_INCLUDE_DIRS NAMES gtest/gtest.h
-    PATHS /usr/include /usr/local/include)
-
-find_library(GTEST_LIBRARY gtest
-  PATHS /usr/local/lib /usr/lib64)
-
-find_library(GTEST_MAIN_LIBRARY gtest_main
-  PATHS /usr/local/lib /usr/lib64)
-
-include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(gtest
-  REQUIRED_VARS GTEST_LIBRARY GTEST_MAIN_LIBRARY GTEST_INCLUDE_DIRS)
-
-if(gtest_FOUND)
-  set(GTEST_FOUND 1)
-endif()
-
-## GMOCK
-
-find_path(GMOCK_INCLUDE_DIRS NAMES gmock/gmock.h
-    PATHS /usr/include /usr/local/include)
-
-find_library(GMOCK_LIBRARY gmock
-  PATHS /usr/local/lib /usr/lib64)
-
-find_library(GMOCK_MAIN_LIBRARY gmock_main
-  PATHS /usr/local/lib /usr/lib64)
-
-include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(gmock
-  REQUIRED_VARS GMOCK_LIBRARY GMOCK_MAIN_LIBRARY GMOCK_INCLUDE_DIRS)
-
-if(gmock_FOUND)
-  set(GMOCK_FOUND 1)
-endif()

diff --git a/sim/CMakeLists.txt b/sim/CMakeLists.txt
index febd4f0ab6f826fc669a9047b2c86fd7dc8c351d..c088d2f1cd7c96205a7183354f84e86df65b04be 100644 (file)
--- a/sim/CMakeLists.txt
+++ b/sim/CMakeLists.txt
@@ -1 +1,9 @@
+if(K_WAY_HEAP)
+  if(K_WAY_HEAP LESS 2)
+    message(FATAL_ERROR "K_WAY_HEAP value should be at least 2")
+  else()
+    set(CMAKE_CXX_SIM_FLAGS "-DK_WAY_HEAP=${K_WAY_HEAP}")
+  endif()
+endif()
+
 add_subdirectory(src)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 691e64cce4389f914047ad49e45d49519984f2eb..7178f266e2a41d13276ad1fbe3a92bc49135cd37 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,7 +1,12 @@
+include_directories(${GTEST_INCLUDE_DIRS})
+include_directories(${Boost_INCLUDE_DIRS})
 include_directories(../support/src)
-include_directories(${BOOST_INCLUDE_DIR})
 
-set(local_flags "-Wall -pthread")
+set(local_flags "-std=c++11 -Wno-write-strings -Wall -pthread")
+
+if(DO_NOT_DELAY_TAG_CALC)
+  set(local_flags "${local_flags} -DDO_NOT_DELAY_TAG_CALC")
+endif()
 
 set(dmc_srcs dmclock_util.cc ../support/src/run_every.cc)
 

diff --git a/support/CMakeLists.txt b/support/CMakeLists.txt
deleted file mode 100644 (file)
index 552439e..0000000
--- a/support/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-add_subdirectory(test)

diff --git a/support/test/CMakeLists.txt b/support/test/CMakeLists.txt
index addea6c96a996c607345c6139674705142084bb6..1e1ea25cc14e3dcaac1c2bca421a82e8eab025c2 100644 (file)
--- a/support/test/CMakeLists.txt
+++ b/support/test/CMakeLists.txt
@@ -24,6 +24,3 @@ add_executable(dmclock-data-struct-tests ${test_srcs})
 
 target_link_libraries(dmclock-data-struct-tests
   LINK_PRIVATE gtest gtest_main pthread)
-
-add_test(NAME dmclock-data-struct-tests
-  COMMAND $<TARGET_FILE:dmclock-data-struct-tests>)

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index e72810b56aa73feeaaf738922f50fba44d853e13..24da2e7320a5d02343355ee442b825a424bdbf17 100644 (file)
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,7 +1,6 @@
 include_directories(../src)
 include_directories(../support/src)
 include_directories(../sim/src)
-include_directories(${BOOST_INCLUDE_DIR})
 
 set(support_srcs ../sim/src/test_dmclock.cc)
 set(test_srcs
@@ -26,10 +25,7 @@ if (TARGET gtest AND TARGET gtest_main)
     $<TARGET_FILE:gtest_main>)
 else()
   target_link_libraries(dmclock-tests
-    LINK_PRIVATE $<TARGET_FILE:dmclock> pthread ${GTEST_LIBRARY} ${GTEST_MAIN_LIBRARY})
+    LINK_PRIVATE $<TARGET_FILE:dmclock> pthread ${GTEST_LIBRARIES} ${GTEST_MAIN_LIBRARIES})
 endif()
   
 add_dependencies(dmclock-tests dmclock)
-
-add_test(NAME dmclock-tests
-  COMMAND $<TARGET_FILE:dmclock-tests>)