Skip to content

Fix #143: SystemLink Cmake module is unnecessary complexity #145

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lefticus merged 2 commits into from
Apr 12, 2026
Merged

Fix #143: SystemLink Cmake module is unnecessary complexity #145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
528bdb7
Fix #143: Remove SystemLink.cmake, use CPM SYSTEM option instead
leftibot Apr 11, 2026
c5426d7
Address review: remove CMake test scripts, don't SYSTEM-include lefti…
leftibot Apr 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 45 additions & 5 deletions Dependencies.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,15 @@ function(myproject_setup_dependencies)
# already been provided to us by a parent project

if(NOT TARGET fmtlib::fmtlib)
cpmaddpackage("gh:fmtlib/fmt#12.1.0")
cpmaddpackage(
NAME
fmt
GITHUB_REPOSITORY
"fmtlib/fmt"
GIT_TAG
"12.1.0"
SYSTEM
YES)
endif()

if(NOT TARGET spdlog::spdlog)
Expand All @@ -20,24 +28,56 @@ function(myproject_setup_dependencies)
1.17.0
GITHUB_REPOSITORY
"gabime/spdlog"
SYSTEM
YES
OPTIONS
"SPDLOG_FMT_EXTERNAL ON")
endif()

if(NOT TARGET Catch2::Catch2WithMain)
cpmaddpackage("gh:catchorg/Catch2@3.12.0")
cpmaddpackage(
NAME
Catch2
VERSION
3.12.0
GITHUB_REPOSITORY
"catchorg/Catch2"
SYSTEM
YES)
endif()

if(NOT TARGET CLI11::CLI11)
cpmaddpackage("gh:CLIUtils/CLI11@2.6.1")
cpmaddpackage(
NAME
CLI11
VERSION
2.6.1
GITHUB_REPOSITORY
"CLIUtils/CLI11"
SYSTEM
YES)
endif()

if(NOT TARGET ftxui::screen)
cpmaddpackage("gh:ArthurSonzogni/FTXUI@6.1.9")
cpmaddpackage(
NAME
FTXUI
VERSION
6.1.9
GITHUB_REPOSITORY
"ArthurSonzogni/FTXUI"
SYSTEM
YES)
endif()

if(NOT TARGET tools::tools)
cpmaddpackage("gh:lefticus/tools#main")
cpmaddpackage(
NAME
tools
GITHUB_REPOSITORY
"lefticus/tools"
GIT_TAG
"main")
endif()

endfunction()
1 change: 0 additions & 1 deletion ProjectOptions.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
include(cmake/SystemLink.cmake)
include(cmake/LibFuzzer.cmake)
include(CMakeDependentOption)
include(CheckCXXCompilerFlag)
Expand Down
83 changes: 0 additions & 83 deletions cmake/SystemLink.cmake
View file
Open in desktop

This file was deleted.

6 changes: 1 addition & 5 deletions src/ftxui_sample/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,7 @@ add_executable(intro main.cpp)
target_link_libraries(
intro
PRIVATE myproject::myproject_options
myproject::myproject_warnings)

target_link_system_libraries(
intro
PRIVATE
myproject::myproject_warnings
CLI11::CLI11
fmt::fmt
spdlog::spdlog
Expand Down
Loading