diff options
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | cmake/modules/PaludisAddTest.cmake | 7 |
2 files changed, 3 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 286eb79e3..66018f035 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ # vim: set et fdm=marker fmr={{{,}}} sw=2 sts=2 ts=8: -cmake_minimum_required(VERSION 3.3.0) +cmake_minimum_required(VERSION 3.5.0) cmake_policy(SET CMP0048 NEW) cmake_policy(SET CMP0051 NEW) cmake_policy(SET CMP0057 NEW) diff --git a/cmake/modules/PaludisAddTest.cmake b/cmake/modules/PaludisAddTest.cmake index 38362e4a9..684da49c8 100644 --- a/cmake/modules/PaludisAddTest.cmake +++ b/cmake/modules/PaludisAddTest.cmake @@ -22,15 +22,12 @@ function(paludis_add_test test_name) "${CMAKE_CURRENT_SOURCE_DIR}/${test_name}.cc") endif() if(PAT_GTEST) - target_include_directories(${test_name} - PRIVATE - ${GTEST_INCLUDE_DIRS}) target_link_libraries(${test_name} PRIVATE libpaludis libpaludisutil - ${GTEST_BOTH_LIBRARIES} - Threads::Threads + GTest::GTest + GTest::Main ${PAT_LINK_LIBRARIES}) endif() |