From d7356bb01cb6abf4c1b2fe2e110b829662d27745 Mon Sep 17 00:00:00 2001 From: Simon Brand Date: Tue, 25 Jun 2019 09:47:19 +0100 Subject: [PATCH] Use FetchContent --- CMakeLists.txt | 13 +++++++++++-- cmake/tl-cmake | 1 - 2 files changed, 11 insertions(+), 3 deletions(-) delete mode 160000 cmake/tl-cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index 18246ad..b285424 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,10 +1,19 @@ -cmake_minimum_required(VERSION 3.8) +cmake_minimum_required(VERSION 3.11) project(tl-optional VERSION 1.0.0 LANGUAGES CXX) option(OPTIONAL_ENABLE_TESTS "Enable tests." ON) -set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake/tl-cmake" ${CMAKE_MODULE_PATH}) +include(FetchContent) +FetchContent_Declare( + tl_cmake + GIT_REPOSITORY https://github.com/TartanLlama/tl-cmake.git +) +FetchContent_GetProperties(tl_cmake) +if(NOT tl_cmake_POPULATED) + FetchContent_Populate(tl_cmake) + set(CMAKE_MODULE_PATH ${tl_cmake_SOURCE_DIR} ${CMAKE_MODULE_PATH}) +endif() include(add-tl) tl_add_library(optional SOURCES diff --git a/cmake/tl-cmake b/cmake/tl-cmake deleted file mode 160000 index 576e25f..0000000 --- a/cmake/tl-cmake +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 576e25feabec4c79ebe2cf7174398c61de05d384