diff --git a/CMakeLists.txt b/CMakeLists.txt index 177ea45..3bfbc8a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,7 @@ # PROJECT INFORMATION #------------------------------- -cmake_minimum_required(VERSION 3.13) +cmake_minimum_required(VERSION 3.14) project(sdbus-c++ VERSION 1.4.0 LANGUAGES C CXX) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index cc5e1b8..99aa27a 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -32,19 +32,13 @@ if (NOT TARGET GTest::gmock) GIT_SHALLOW 1 UPDATE_COMMAND "") - #FetchContent_MakeAvailable(googletest) # Not available in CMake 3.13 :-( Let's do it manually: - FetchContent_GetProperties(googletest) - if(NOT googletest_POPULATED) - FetchContent_Populate(googletest) - set(gtest_force_shared_crt ON CACHE INTERNAL "" FORCE) - set(BUILD_GMOCK ON CACHE INTERNAL "" FORCE) - set(INSTALL_GTEST OFF CACHE INTERNAL "" FORCE) - set(BUILD_SHARED_LIBS_BAK ${BUILD_SHARED_LIBS}) - set(BUILD_SHARED_LIBS OFF) - add_subdirectory(${googletest_SOURCE_DIR} ${googletest_BINARY_DIR}) - set(BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS_BAK}) - add_library(GTest::gmock ALIAS gmock) - endif() + set(gtest_force_shared_crt ON CACHE INTERNAL "" FORCE) + set(INSTALL_GTEST OFF CACHE INTERNAL "" FORCE) + set(BUILD_SHARED_LIBS_BAK ${BUILD_SHARED_LIBS}) + set(BUILD_SHARED_LIBS OFF) + FetchContent_MakeAvailable(googletest) + set(BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS_BAK}) + add_library(GTest::gmock ALIAS gmock) endif() endif()