From f2e2a7d6e1b1aa90ab3cb835388ede95665d832b Mon Sep 17 00:00:00 2001 From: Bartosz Wieczorek Date: Mon, 22 Jan 2018 15:44:26 +0100 Subject: [PATCH] refactor cmake --- CMakeLists.txt | 22 +++++----------------- cmake/FindAllRequirements.cmake | 17 +++++++++++++++++ 2 files changed, 22 insertions(+), 17 deletions(-) create mode 100644 cmake/FindAllRequirements.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index ce83c9e..c4dd167 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,37 +11,25 @@ project(eedb) add_definitions( -std=c++1z ) -hunter_add_package(Boost) -find_package(Boost CONFIG REQUIRED) +include(cmake/FindAllRequirements.cmake) + #hunter_add_package(Boost COMPONENTS system filesystem) #find_package(Boost CONFIG REQUIRED system filesystem) #target_link_libraries(... Boost::system Boost::filesystem) - -hunter_add_package(nlohmann_json) -find_package(nlohmann_json CONFIG REQUIRED) #add_executable(main main.cpp) #target_link_libraries(main PUBLIC nlohmann_json) - -hunter_add_package(GTest) -find_package(GMock CONFIG REQUIRED) - -hunter_add_package(benchmark) -find_package(benchmark CONFIG REQUIRED) -#target_link_libraries(... benchmark::benchmark) #target_link_libraries(foo GTest::main) # GTest::gtest will be linked automatically #target_link_libraries(boo GTest::gtest) - -hunter_add_package(spdlog) -find_package(spdlog CONFIG REQUIRED) - +#target_link_libraries(... benchmark::benchmark) #target_link_libraries(... spdlog::spdlog) +#add_executable(comprehensions comprehensions.cpp) +#target_link_libraries(comprehensions PUBLIC range-v3::range-v3) #set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "/usr/share/cmake/Modules/") #find_package(Wt REQUIRED) #find_package(Sqlpp11 REQUIRED) #find_package(PostgreSQL REQUIRED) -#include_directories(share/include) #add_subdirectory(src) #add_subdirectory(tests) #add_subdirectory(benchmarks) diff --git a/cmake/FindAllRequirements.cmake b/cmake/FindAllRequirements.cmake new file mode 100644 index 0000000..4337021 --- /dev/null +++ b/cmake/FindAllRequirements.cmake @@ -0,0 +1,17 @@ +hunter_add_package(Boost) +find_package(Boost CONFIG REQUIRED) + +hunter_add_package(nlohmann_json) +find_package(nlohmann_json CONFIG REQUIRED) + +hunter_add_package(GTest) +find_package(GMock CONFIG REQUIRED) + +hunter_add_package(benchmark) +find_package(benchmark CONFIG REQUIRED) + +hunter_add_package(spdlog) +find_package(spdlog CONFIG REQUIRED) + +hunter_add_package(range-v3) +find_package(range-v3 CONFIG REQUIRED)