Skip to content

Use maths from the system if the bundled one is not available #78

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
sebsjames merged 11 commits into from
Sep 30, 2025
Merged

Use maths from the system if the bundled one is not available #78

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
d34cffa
Use maths from vcpkg if the git submodule is not available
rremilian Sep 27, 2025
91b7e28
update: is maths, not mathplot
rremilian Sep 27, 2025
5f0178c
update: use find_path to find SEBSJAMES_MATHS_INCLUDE_DIRS
rremilian Sep 27, 2025
0e38fb2
update: also use REQUIRED for maths
rremilian Sep 27, 2025
8eed274
update: finish comment
rremilian Sep 27, 2025
04f7a3e
update: forgot to end string
rremilian Sep 27, 2025
4a3e78f
update: fix typo
rremilian Sep 27, 2025
a88c371
update: forgot to add /*
rremilian Sep 27, 2025
99355cd
update: change variable name for better readability
rremilian Sep 27, 2025
da5f16e
update: change status message
rremilian Sep 27, 2025
fd41092
update: use just maths
rremilian Sep 27, 2025
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
11 changes: 10 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,16 @@ find_package(Freetype REQUIRED)
include_directories(${FREETYPE_INCLUDE_DIRS})

# Include the maths subdirectory (sebsjames/maths is git-submoduled)
include_directories(${PROJECT_SOURCE_DIR}/maths)
# If the subdirectory is not available, try to include maths from system
file(GLOB bundled_maths ${PROJECT_SOURCE_DIR}/maths/*)
if(bundled_maths)
message(STATUS "Using bundled maths")
include_directories(${PROJECT_SOURCE_DIR}/maths)
else()
message(STATUS "Using maths from vcpkg")
find_path(MATHS_INCLUDE_DIRS "sm/algo" REQUIRED)
include_directories(${MATHS_INCLUDE_DIRS})
endif()

# Use packaged nlohmann json
find_package(nlohmann_json REQUIRED)
Expand Down