From 81b7207121e41c3b838eca6f54396e4f676fa3d8 Mon Sep 17 00:00:00 2001 From: Arthur Sonzogni Date: Sat, 22 Jan 2022 17:58:33 +0100 Subject: [PATCH] Move to v2.0.0 (#315) --- CHANGELOG.md | 7 +++++-- CMakeLists.txt | 2 +- cmake/ftxui_benchmark.cmake | 7 ++++++- cmake/ftxui_test.cmake | 8 ++++++-- 4 files changed, 18 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c3b8df5..2070a39 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,11 @@ Changelog ========= -unreleased (development) ------------------------- +current (development) +--------------------- + +2.0.0 +----- ### Features: diff --git a/CMakeLists.txt b/CMakeLists.txt index 959fed3..9a3c268 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.11) project(ftxui LANGUAGES CXX - VERSION 0.11.1 + VERSION 2.0.0 ) option(FTXUI_BUILD_DOCS "Set to ON to build docs" ON) diff --git a/cmake/ftxui_benchmark.cmake b/cmake/ftxui_benchmark.cmake index df24458..0740476 100644 --- a/cmake/ftxui_benchmark.cmake +++ b/cmake/ftxui_benchmark.cmake @@ -3,7 +3,12 @@ if (NOT WIN32) GIT_REPOSITORY "https://github.com/google/benchmark" GIT_TAG 62937f91b5c763a8e119d0c20c67b87bde8eff1c ) - FetchContent_MakeAvailable(googlebenchmark) + + FetchContent_GetProperties(googlebenchmark) + if(NOT googlebenchmark_POPULATED) + FetchContent_Populate(googlebenchmark) + add_subdirectory(${googlebenchmark_SOURCE_DIR} ${googlebenchmark_BINARY_DIR} EXCLUDE_FROM_ALL) + endif() add_executable(ftxui_benchmark src/ftxui/dom/benchmark_test.cpp diff --git a/cmake/ftxui_test.cmake b/cmake/ftxui_test.cmake index 66cafa2..1bb13c2 100644 --- a/cmake/ftxui_test.cmake +++ b/cmake/ftxui_test.cmake @@ -4,11 +4,15 @@ set(gtest_force_shared_crt ON CACHE BOOL "" FORCE) set(FETCHCONTENT_UPDATES_DISCONNECTED TRUE) include(FetchContent) -FetchContent_Declare( googletest +FetchContent_Declare(googletest GIT_REPOSITORY "https://github.com/google/googletest" GIT_TAG 23ef29555ef4789f555f1ba8c51b4c52975f0907 ) -FetchContent_MakeAvailable(googletest) +FetchContent_GetProperties(googletest) +if(NOT googletest_POPULATED) + FetchContent_Populate(googletest) + add_subdirectory(${googletest_SOURCE_DIR} ${googletest_BINARY_DIR} EXCLUDE_FROM_ALL) +endif() add_executable(tests src/ftxui/component/component_test.cpp