From e38fde6450f5b102a9f3d3842a9286de4b678a5e Mon Sep 17 00:00:00 2001
From: Chris Kennelly <ckennelly@ckennelly.com>
Date: Wed, 23 Apr 2014 00:47:07 -0700
Subject: [PATCH] Setup targets from each directory, rather than the top-level.

---
 CMakeLists.txt      | 19 +++----------------
 src/CMakeLists.txt  | 14 ++++++++++++++
 test/CMakeLists.txt |  3 +++
 3 files changed, 20 insertions(+), 16 deletions(-)
 create mode 100644 src/CMakeLists.txt
 create mode 100644 test/CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 09fe0b24..e4c6aa2c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,19 +30,6 @@ include_directories(${PROJECT_SOURCE_DIR}/include)
 include_directories(${PROJECT_SOURCE_DIR}/src)
 
 # Build the targets
-FILE(GLOB SOURCE_FILES "src/*.cc")
-add_library(benchmark STATIC ${SOURCE_FILES})
-
-add_executable(benchmark_test test/benchmark_test.cc)
-target_link_libraries(benchmark_test benchmark ${CMAKE_THREAD_LIBS_INIT})
-
-# Install target (will install the library to specified CMAKE_INSTALL_PREFIX variable)
-INSTALL(
-  TARGETS benchmark
-  ARCHIVE DESTINATION lib
-  LIBRARY DESTINATION lib
-  COMPONENT library)
-INSTALL(
-  DIRECTORY "${PROJECT_SOURCE_DIR}/include/benchmark"
-  DESTINATION include
-  FILES_MATCHING PATTERN "*.*h")
\ No newline at end of file
+enable_testing()
+add_subdirectory(src)
+add_subdirectory(test)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
new file mode 100644
index 00000000..6c5857ce
--- /dev/null
+++ b/src/CMakeLists.txt
@@ -0,0 +1,14 @@
+set(SOURCE_FILES "benchmark.cc" "colorprint.cc" "commandlineflags.cc" "sleep.cc" "sysinfo.cc" "walltime.cc")
+
+add_library(benchmark STATIC ${SOURCE_FILES})
+
+# Install target (will install the library to specified CMAKE_INSTALL_PREFIX variable)
+install(
+  TARGETS benchmark
+  ARCHIVE DESTINATION lib
+  LIBRARY DESTINATION lib
+  COMPONENT library)
+install(
+  DIRECTORY "${PROJECT_SOURCE_DIR}/include/benchmark"
+  DESTINATION include
+  FILES_MATCHING PATTERN "*.*h")
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
new file mode 100644
index 00000000..f725365a
--- /dev/null
+++ b/test/CMakeLists.txt
@@ -0,0 +1,3 @@
+# Demonstration executable
+add_executable(benchmark_test benchmark_test.cc)
+target_link_libraries(benchmark_test benchmark ${CMAKE_THREAD_LIBS_INIT})