From 7efe8a638504e2de627a4c2c4cb3e2e919326961 Mon Sep 17 00:00:00 2001 From: Arthur Sonzogni Date: Sun, 6 Jan 2019 18:53:02 +0100 Subject: [PATCH] Separator ftxui::{screen,dom,component} into separate build unit. --- CMakeLists.txt | 4 + examples/CMakeLists.txt | 9 +- examples/component/CMakeLists.txt | 6 + examples/dom/CMakeLists.txt | 5 + ftxui/CMakeLists.txt | 133 ++++++++++++++------ ftxui/include/ftxui/dom/elements.hpp | 1 + ftxui/src/ftxui/dom/composite_decorator.cpp | 4 + 7 files changed, 121 insertions(+), 41 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index dfd71f2..5b79896 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,8 @@ cmake_minimum_required(VERSION 3.0) +project(ftxui + LANGUAGES CXX + VERSION 0.1 +) enable_testing() diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index 5f62cc8..ded04f0 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -1,10 +1,7 @@ cmake_minimum_required(VERSION 3.0) -function(example name) - add_executable(${name} ${name}.cpp) - target_link_libraries(${name} PUBLIC ftxui) -endfunction(example) - add_subdirectory(component) add_subdirectory(dom) -example(print_key_press) + +add_executable(print_key_press print_key_press.cpp) +target_link_libraries(print_key_press PUBLIC component) diff --git a/examples/component/CMakeLists.txt b/examples/component/CMakeLists.txt index d1bab8c..9f2f9f5 100644 --- a/examples/component/CMakeLists.txt +++ b/examples/component/CMakeLists.txt @@ -1,3 +1,9 @@ +find_package(ftxui) +function(example name) + add_executable(${name} ${name}.cpp) + target_link_libraries(${name} PUBLIC component) +endfunction(example) + example(input) example(menu) example(menu2) diff --git a/examples/dom/CMakeLists.txt b/examples/dom/CMakeLists.txt index 437b1f7..2936ec7 100644 --- a/examples/dom/CMakeLists.txt +++ b/examples/dom/CMakeLists.txt @@ -1,3 +1,8 @@ +function(example name) + add_executable(${name} ${name}.cpp) + target_link_libraries(${name} PUBLIC dom) +endfunction(example) + example(blink) example(bold) example(color) diff --git a/ftxui/CMakeLists.txt b/ftxui/CMakeLists.txt index 73aba01..78d3214 100644 --- a/ftxui/CMakeLists.txt +++ b/ftxui/CMakeLists.txt @@ -1,15 +1,28 @@ cmake_minimum_required(VERSION 3.0) -add_library(ftxui - src/ftxui/component/component.cpp - src/ftxui/component/component_direction.cpp - src/ftxui/component/component_horizontal.cpp - src/ftxui/component/component_vertical.cpp - src/ftxui/component/event.cpp - src/ftxui/component/input.cpp - src/ftxui/component/menu.cpp - src/ftxui/component/screen_interactive.cpp - src/ftxui/component/toggle.cpp +#################### +# ftxui::screen +#################### +add_library(screen + src/ftxui/screen/screen.cpp + src/ftxui/terminal.cpp + src/ftxui/util/string.cpp +) + +target_include_directories(screen + PUBLIC + $ + $ + PRIVATE src +) + +target_compile_features(screen PUBLIC cxx_std_17) +target_compile_options(screen PRIVATE -Wall) + +#################### +# ftxui::dom +#################### +add_library(dom src/ftxui/dom/blink.cpp src/ftxui/dom/bold.cpp src/ftxui/dom/color.cpp @@ -28,45 +41,95 @@ add_library(ftxui src/ftxui/dom/underlined.cpp src/ftxui/dom/util.cpp src/ftxui/dom/vbox.cpp - src/ftxui/screen/screen.cpp - src/ftxui/terminal.cpp - src/ftxui/util/string.cpp ) -target_include_directories(ftxui - PUBLIC include +target_include_directories(dom + PUBLIC + $ + $ PRIVATE src ) -target_compile_features(ftxui PUBLIC cxx_std_17) -target_compile_options(ftxui PRIVATE -Wall) +target_link_libraries(dom + PUBLIC screen +) + +target_compile_features(dom PUBLIC cxx_std_17) +target_compile_options(dom PRIVATE -Wall) + +#################### +# ftxui::component +#################### +add_library(component + src/ftxui/component/component.cpp + src/ftxui/component/component_direction.cpp + src/ftxui/component/component_horizontal.cpp + src/ftxui/component/component_vertical.cpp + src/ftxui/component/event.cpp + src/ftxui/component/input.cpp + src/ftxui/component/menu.cpp + src/ftxui/component/screen_interactive.cpp + src/ftxui/component/toggle.cpp +) + +target_include_directories(component + PUBLIC + $ + $ + PRIVATE src +) + +target_link_libraries(component + PUBLIC dom +) + +target_compile_features(component PUBLIC cxx_std_17) +target_compile_options(component PRIVATE -Wall) + +include(GNUInstallDirs) +install(TARGETS screen dom component + EXPORT ftxui-export + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/ftxui/ + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/ftxui/ +) + +install(DIRECTORY include/ftxui DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) + +include(CMakePackageConfigHelpers) +write_basic_package_version_file( + ftxui-config.cmake + VERSION ${PACKAGE_VERSION} + COMPATIBILITY AnyNewerVersion +) + +install(EXPORT ftxui-export + FILE ftxui-targets.cmake + NAMESPACE ftxui:: + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/ftxui +) # Note: For gtest, please follow: # https://stackoverflow.com/questions/24295876/cmake-cannot-find-a-googletest-required-library find_package(GTest) find_package(Threads) if (GTEST_FOUND AND THREADS_FOUND) - function(add_new_test test_name test_files) - add_executable(${ARGV}) - target_link_libraries(${test_name} - PRIVATE - ftxui - Threads::Threads - ${GTEST_BOTH_LIBRARIES} - ) - target_include_directories(ftxui - PRIVATE - ${GTest_INCLUDE_DIRS} - ftxui - ) - gtest_discover_tests(${test_name}) - add_test(${test_name} ${test_name}) - endfunction(add_new_test) - - add_new_test(dom_tests + add_executable(dom_tests src/ftxui/dom/gauge_test.cpp src/ftxui/dom/hbox_test.cpp src/ftxui/dom/text_test.cpp src/ftxui/dom/vbox_test.cpp ) + + target_link_libraries(dom_tests + PRIVATE dom + PRIVATE Threads::Threads + PRIVATE ${GTEST_BOTH_LIBRARIES} + ) + + target_include_directories(dom_tests + PRIVATE ${GTest_INCLUDE_DIRS} + ) + gtest_discover_tests(dom_tests) + add_test(dom_tests dom_tests) + endif() diff --git a/ftxui/include/ftxui/dom/elements.hpp b/ftxui/include/ftxui/dom/elements.hpp index f21d76d..1f72615 100644 --- a/ftxui/include/ftxui/dom/elements.hpp +++ b/ftxui/include/ftxui/dom/elements.hpp @@ -43,6 +43,7 @@ Decorator bgcolor(Color); Element hcenter(Element); Element vcenter(Element); Element center(Element); +Element align_right(Element); // --- Util --- Element nothing(Element element); diff --git a/ftxui/src/ftxui/dom/composite_decorator.cpp b/ftxui/src/ftxui/dom/composite_decorator.cpp index eda0155..6cb81bd 100644 --- a/ftxui/src/ftxui/dom/composite_decorator.cpp +++ b/ftxui/src/ftxui/dom/composite_decorator.cpp @@ -15,4 +15,8 @@ std::unique_ptr center(Element child) { return hcenter(vcenter(std::move(child))); } +std::unique_ptr align_right(Element child) { + return hbox(filler(), std::move(child)); +} + } // namespace ftxui::dom