From af90b900f12c6c42a535182d9ced95247f6a0cb8 Mon Sep 17 00:00:00 2001 From: Andre Sailer <andre.philippe.sailer@cern.ch> Date: Tue, 16 Apr 2024 20:29:51 +0200 Subject: [PATCH] NXCals: allow different version strings --- cmake/toolchain/nxcals.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/toolchain/nxcals.cmake b/cmake/toolchain/nxcals.cmake index a8d29cafe8..c642242b87 100644 --- a/cmake/toolchain/nxcals.cmake +++ b/cmake/toolchain/nxcals.cmake @@ -5,8 +5,8 @@ set(NXCALS_MGM_URL root://eosproject.cern.ch://) set(PATTERN_NXCALS_JAVA "data-access-libs") set(PATTERN_NXCALS_PYTHON "extraction_api_python3-") -# a number followed by repeated (either a dot or rc (release candidate) or b (beta) and another number) -set(NXCALS_VERSION_MATCH "[0-9]((\\.|rc|b)[0-9]+)+") +# a number followed by repeated (a dot followed by numbers or letters or both) +set(NXCALS_VERSION_MATCH "[0-9](\\.[a-z0-9]+)+") # upgrade pip for latest version execute_process(COMMAND $ENV{SHELL} -c "python3 -m pip install --upgrade --user pip") -- GitLab