Skip to content

Commit cc50d9b

Browse files
authored
Merge pull request #521 from ValeevGroup/evaleev/cmake/override-mad-repo-and-tag-via-cache
[cmake] override MADNESS repo and tag via CACHE variables
2 parents 58dc2de + f787973 commit cc50d9b

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

.gitlab-ci.yml

+3
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ variables:
1919
${BLA_VENDOR}
2020
${BLA_THREADS}
2121
${TA_SCALAPACK}
22+
TA_TRACKED_MADNESS_URL=/root/github/madness
2223
2324
before_script:
2425
# NB: if CMAKE_BUILD_PARALLEL_LEVEL is not set (i.e. using shared runner), use 1 to ensure we have enough memory
@@ -33,6 +34,8 @@ before_script:
3334
- ccache -p
3435
# zero out the ccache statistics
3536
- ccache -z
37+
# update local copy of GH:madness
38+
- git fetch /root/github/madness
3639

3740
ubuntu:
3841
stage: build

cmake/modules/FindOrFetchMADWorld.cmake

+2-2
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@ if (NOT TARGET MADworld)
4747
include(FetchContent)
4848
FetchContent_Declare(
4949
MADNESS
50-
GIT_REPOSITORY https://github.com/m-a-d-n-e-s-s/madness.git
50+
GIT_REPOSITORY "${TA_TRACKED_MADNESS_URL}"
5151
GIT_TAG ${TA_TRACKED_MADNESS_TAG}
52-
GIT_PROGRESS TRUE
52+
GIT_PROGRESS TRUE
5353
)
5454
FetchContent_MakeAvailable(MADNESS)
5555
FetchContent_GetProperties(MADNESS

external/versions.cmake

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ set(TA_INSTALL_EIGEN_PREVIOUS_VERSION 3.3.7)
1111
set(TA_INSTALL_EIGEN_URL_HASH SHA256=b4c198460eba6f28d34894e3a5710998818515104d6e74e5cc331ce31e46e626)
1212
set(TA_INSTALL_EIGEN_PREVIOUS_URL_HASH MD5=b9e98a200d2455f06db9c661c5610496)
1313

14-
set(TA_TRACKED_MADNESS_TAG bd84a52766ab497dedc2f15f2162fb0eb7ec4653)
14+
set(TA_TRACKED_MADNESS_URL https://github.com/m-a-d-n-e-s-s/madness.git CACHE STRING "GIT_REPOSITORY for cloning MADNESS source")
15+
set(TA_TRACKED_MADNESS_TAG bd84a52766ab497dedc2f15f2162fb0eb7ec4653 CACHE STRING "GIT_TAG (branch or hash) for cloning MADNESS")
1516
set(TA_TRACKED_MADNESS_PREVIOUS_TAG ef97ad1f0080da04f9592f03185c1a331cd5e001)
1617
set(TA_TRACKED_MADNESS_VERSION 0.10.1)
1718
set(TA_TRACKED_MADNESS_PREVIOUS_VERSION 0.10.1)

0 commit comments

Comments
 (0)