From 7d9e9f4a549a683b5b525aa1688086d99807b09c Mon Sep 17 00:00:00 2001 From: "Robin E. R. Davies" Date: Sat, 15 Feb 2025 18:11:15 -0500 Subject: [PATCH] FTXUI CMake policies --- CMakeLists.txt | 4 ---- src/CMakeLists.txt | 5 +++++ 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f0deb4b..19b6ca6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,10 +15,6 @@ include(CTest) enable_testing() - - - - #add_subdirectory("submodules/pipedal_p2pd") add_subdirectory("PiPedalCommon") diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index a867dea..c5979e2 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -14,10 +14,15 @@ set(CXX_STANDARD 20) include(FetchContent) +# FOR FTXUI if(CMAKE_VERSION VERSION_GREATER 3.30) cmake_policy(SET CMP0169 OLD) # Allow use of old FETCHCONTENT macros. endif() +# Our FTXUI option takes precedence over the one in the ftxui CMakeLists.txt +# because FTXUI uses cmake_minimum_required(VERSION 3.12) +set(CMAKE_POLICY_DEFAULT_CMP0077 NEW) + set(FETCHCONTENT_QUIET ON) set(FTXUI_QUIET ON)