Skip to content

Commit a08b48c

Browse files
authored
Merge pull request #3361 from eseiler/fix/cmake
[FIX,INFRA] cmake: version variables cannot be forced
2 parents 5d07997 + 4140e50 commit a08b48c

File tree

2 files changed

+14
-7
lines changed

2 files changed

+14
-7
lines changed

.github/workflows/cron_debian.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
id: source_package
3838
run: |
3939
mkdir source && cd source
40-
git clone --depth 1 https://github.com/seqan/seqan3.git
40+
git clone --depth 1 --branch "${{ github.ref_name }}" https://github.com/${{ github.repository }}.git
4141
mkdir package && cd package
4242
cmake ../seqan3
4343
make package_source

cmake/package-lock.cmake

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,25 @@
1313
# Ideally, both are the same, which might not always be possible: https://github.com/cpm-cmake/CPM.cmake/issues/603
1414
# This is needed to support CPM_USE_LOCAL_PACKAGES
1515

16+
# Each package has a (project-prefixed) version variable, which allows changing the version of a package without
17+
# changing the package lock file.
18+
# This is useful for packaging, where there might only be an older version, e.g. of googletest, available.
19+
# Note that the variable has to be a cache variable to work properly, but not a forced cache variable.
20+
# A clean reconfigure, i.e. deleting CMakeCache.txt, is needed to update the default version in an existing
21+
# build directory.
22+
1623
# cmake-format: off
1724

1825
# cereal
19-
set (SEQAN3_CEREAL_VERSION 1.3.2 CACHE STRING "" FORCE)
26+
set (SEQAN3_CEREAL_VERSION 1.3.2 CACHE STRING "")
2027
CPMDeclarePackage (cereal
2128
NAME cereal
2229
VERSION ${SEQAN3_CEREAL_VERSION}
2330
GITHUB_REPOSITORY USCiLab/cereal
2431
SYSTEM TRUE
2532
OPTIONS "JUST_INSTALL_CEREAL ON" "CMAKE_MESSAGE_LOG_LEVEL WARNING")
2633
# benchmark
27-
set (SEQAN3_BENCHMARK_VERSION 1.9.2 CACHE STRING "" FORCE)
34+
set (SEQAN3_BENCHMARK_VERSION 1.9.2 CACHE STRING "")
2835
CPMDeclarePackage (benchmark
2936
NAME benchmark
3037
VERSION ${SEQAN3_BENCHMARK_VERSION}
@@ -33,23 +40,23 @@ CPMDeclarePackage (benchmark
3340
OPTIONS "BENCHMARK_ENABLE_TESTING OFF" "BENCHMARK_ENABLE_WERROR OFF"
3441
"CMAKE_MESSAGE_LOG_LEVEL WARNING")
3542
# googletest
36-
set (SEQAN3_GOOGLETEST_VERSION 1.16.0 CACHE STRING "" FORCE)
43+
set (SEQAN3_GOOGLETEST_VERSION 1.16.0 CACHE STRING "")
3744
CPMDeclarePackage (googletest
3845
NAME GTest
3946
VERSION ${SEQAN3_GOOGLETEST_VERSION}
4047
GITHUB_REPOSITORY google/googletest
4148
SYSTEM TRUE
4249
OPTIONS "BUILD_GMOCK OFF" "INSTALL_GTEST OFF" "CMAKE_MESSAGE_LOG_LEVEL WARNING")
4350
# doxygen-awesome
44-
set (SEQAN3_DOXYGEN_AWESOME_VERSION 2.3.4 CACHE STRING "" FORCE)
51+
set (SEQAN3_DOXYGEN_AWESOME_VERSION 2.3.4 CACHE STRING "")
4552
CPMDeclarePackage (doxygen_awesome
4653
NAME doxygen_awesome
4754
VERSION ${SEQAN3_DOXYGEN_AWESOME_VERSION}
4855
GITHUB_REPOSITORY jothepro/doxygen-awesome-css
4956
DOWNLOAD_ONLY TRUE
5057
QUIET TRUE)
5158
# seqan2
52-
set (SEQAN3_SEQAN2_VERSION 2.5.0 CACHE STRING "" FORCE)
59+
set (SEQAN3_SEQAN2_VERSION 2.5.0 CACHE STRING "")
5360
CPMDeclarePackage (seqan
5461
NAME seqan
5562
VERSION ${SEQAN3_SEQAN2_VERSION}
@@ -58,7 +65,7 @@ CPMDeclarePackage (seqan
5865
DOWNLOAD_ONLY TRUE
5966
QUIET TRUE)
6067
# use_ccache
61-
set (SEQAN3_USE_CCACHE_VERSION d2a54ef555b6fc2d496a4c9506dbeb7cf899ce37 CACHE STRING "" FORCE)
68+
set (SEQAN3_USE_CCACHE_VERSION d2a54ef555b6fc2d496a4c9506dbeb7cf899ce37 CACHE STRING "")
6269
CPMDeclarePackage (use_ccache
6370
NAME use_ccache
6471
GIT_TAG ${SEQAN3_USE_CCACHE_VERSION} # main

0 commit comments

Comments
 (0)