Require cmake 2.8.12 in order to support target_include_directories, and

simplify thread linking logic.

Require cmake 2.8.12 in order to support target_include_directories, and
89a1edae · Geoff Romer · Dominic Hamon · a6ad799a · 89a1edae · 89a1edae
Commit 89a1edae authored Apr 02, 2015 by Geoff Romer Committed by Dominic Hamon Apr 03, 2015
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 8 deletions

CMakeLists.txt CMakeLists.txt +1 -1

CMakeLists.txt src/CMakeLists.txt +2 -7

No files found.
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-cmake_minimum_required (VERSION 2.8)
+cmake_minimum_required (VERSION 2.8.12)
 project (benchmark)
 option(BENCHMARK_ENABLE_TESTING "Enable testing of the benchmark library." ON)

--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -18,14 +18,9 @@ else()
 endif()
 add_library(benchmark ${SOURCE_FILES} ${RE_FILES})
-find_package(Threads REQUIRED)
-# Link threading if building a shared library, otherwise let client do it.
+find_package(Threads REQUIRED)
-if (BUILD_SHARED_LIBS)
+target_link_libraries(benchmark ${CMAKE_THREAD_LIBS_INIT})
-  target_link_libraries(benchmark PRIVATE ${CMAKE_THREAD_LIBS_INIT})
-else()
-  target_link_libraries(benchmark ${CMAKE_THREAD_LIBS_INIT})
-endif()
 set_target_properties(benchmark PROPERTIES
  OUTPUT_NAME "benchmark"