Skip to content
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

add armadillo 12.6.x #124

Merged
merged 2 commits into from
Aug 22, 2023
Merged

add armadillo 12.6.x #124

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
cf9ea4c
add armadillo 12.6.x
conradsnicta Aug 12, 2023
4738602
add armadillo 12.6.x
conradsnicta Aug 12, 2023
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
2 changes: 1 addition & 1 deletion .github/workflows/dependencies.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
strategy:
fail-fast: false
matrix:
armadillo: ["10.6.x", "10.8.x", "11.2.x", "11.4.x", "12.4.x"]
armadillo: ["10.6.x", "10.8.x", "11.2.x", "11.4.x", "12.4.x" "12.6.x"]
pybind: ["v2.6.0", "v2.10.0"]

steps:
Expand Down
4 changes: 2 additions & 2 deletions cmake/GetArmadillo.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
include(FetchContent)

SET(DEFAULT_ARMA_VERSION 12.0.x)
SET(DEFAULT_ARMA_VERSION 12.6.x)
IF (NOT USE_ARMA_VERSION)
MESSAGE(STATUS "carma: Setting Armadillo version to 'v${DEFAULT_ARMA_VERSION}' as none was specified.")
SET(USE_ARMA_VERSION "${DEFAULT_ARMA_VERSION}" CACHE STRING "Choose the version of Armadillo." FORCE)
# Set the possible values of build type for cmake-gui
SET_PROPERTY(CACHE USE_ARMA_VERSION PROPERTY STRINGS
"10.6.x" "10.8.x" "11.2.x" "11.4.x" "12.4.x"
"10.6.x" "10.8.x" "11.2.x" "11.4.x" "12.4.x" "12.6.x"
)
ENDIF ()

Expand Down