Skip to content

Commit 9c5d79c

Browse files
authored
DEP: Bumpy default armadillo 14.4.x to (#133)
1 parent 9c45ef3 commit 9c5d79c

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

.github/workflows/dependencies.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
strategy:
3636
fail-fast: false
3737
matrix:
38-
armadillo: ["10.8.x", "11.4.x", "12.4.x", "12.6.x", "12.8.x"]
38+
armadillo: ["10.8.x", "11.4.x", "12.4.x", "12.6.x", "12.8.x", "14.4.x"]
3939
pybind: ["v2.12.0"]
4040

4141
steps:

cmake/GetArmadillo.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
include(FetchContent)
22

3-
SET(DEFAULT_ARMA_VERSION 12.8.x)
3+
SET(DEFAULT_ARMA_VERSION 14.4.x)
44
IF (NOT USE_ARMA_VERSION)
55
MESSAGE(STATUS "carma: Setting Armadillo version to 'v${DEFAULT_ARMA_VERSION}' as none was specified.")
66
SET(USE_ARMA_VERSION "${DEFAULT_ARMA_VERSION}" CACHE STRING "Choose the version of Armadillo." FORCE)
77
# Set the possible values of build type for cmake-gui
88
SET_PROPERTY(CACHE USE_ARMA_VERSION PROPERTY STRINGS
9-
"10.6.x" "10.8.x" "11.2.x" "11.4.x" "12.4.x" "12.6.x" "12.8.x"
9+
"10.6.x" "10.8.x" "11.2.x" "11.4.x" "12.4.x" "12.6.x" "12.8.x" "14.4.x"
1010
)
1111
ENDIF ()
1212

integration_test/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ ENDIF ()
3232

3333
ADD_SUBDIRECTORY(extern/pybind11)
3434

35-
SET(USE_ARMA_VERSION 12.8.x)
35+
SET(USE_ARMA_VERSION 14.4.x)
3636
FetchContent_Declare(
3737
CarmaArmadillo
3838
GIT_REPOSITORY https://gitlab.com/conradsnicta/armadillo-code.git

0 commit comments

Comments
 (0)