Skip to content

Commit 54a0af9

Browse files
authored
Merge pull request #6 from blaz-kranjc/feature-ftxui-with-conan
Fetch ftxui from conan.
2 parents e5fa609 + 369f515 commit 54a0af9

File tree

3 files changed

+6
-22
lines changed

3 files changed

+6
-22
lines changed

CMakeLists.txt

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,6 @@ set(CMAKE_CXX_EXTENSIONS OFF)
1111

1212
include(FetchContent)
1313

14-
set(FETCHCONTENT_UPDATES_DISCONNECTED TRUE)
15-
FetchContent_Declare(ftxui
16-
GIT_REPOSITORY https://github.com/ArthurSonzogni/ftxui
17-
GIT_TAG v2.0.0
18-
)
19-
20-
FetchContent_GetProperties(ftxui)
21-
if(NOT ftxui_POPULATED)
22-
FetchContent_Populate(ftxui)
23-
add_subdirectory(${ftxui_SOURCE_DIR} ${ftxui_BINARY_DIR} EXCLUDE_FROM_ALL)
24-
endif()
25-
26-
27-
2814
# Note: by default ENABLE_DEVELOPER_MODE is True
2915
# This means that all analysis (sanitizers, static analysis)
3016
# is enabled and all warnings are treated as errors

conanfile.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ catch2/2.13.8
55
docopt.cpp/0.6.3
66
#fmt/8.1.1
77
spdlog/1.9.2
8+
ftxui/2.0.0
89

910
[generators]
1011
cmake_find_package_multi

src/CMakeLists.txt

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
find_package(fmt CONFIG)
22
find_package(spdlog CONFIG)
33
find_package(docopt CONFIG)
4+
find_package(ftxui CONFIG)
45

56
# Generic test that uses conan libs
67
add_executable(intro main.cpp)
@@ -10,13 +11,9 @@ target_link_libraries(
1011
project_warnings
1112
docopt::docopt
1213
fmt::fmt
13-
spdlog::spdlog)
14-
15-
target_link_system_libraries(
16-
intro
17-
PRIVATE
18-
ftxui::screen
19-
ftxui::dom
20-
ftxui::component)
14+
spdlog::spdlog
15+
ftxui::screen
16+
ftxui::dom
17+
ftxui::component)
2118

2219
target_include_directories(intro PRIVATE "${CMAKE_BINARY_DIR}/configured_files/include")

0 commit comments

Comments
 (0)