From b8481a4c4529f75336c76282a1a839701ff10373 Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Sun, 3 Jul 2022 15:40:25 +0200 Subject: [PATCH] Try to fix number of '\' escapes in cmake regexps. --- tools/cmake/MakeLib.cmake | 2 +- tools/cmake/Modules/FindNS3.cmake | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/tools/cmake/MakeLib.cmake b/tools/cmake/MakeLib.cmake index b0b8837cf0..c50bd886ba 100644 --- a/tools/cmake/MakeLib.cmake +++ b/tools/cmake/MakeLib.cmake @@ -133,7 +133,7 @@ if(enable_smpi) if ("${CMAKE_SYSTEM_VERSION}" STRGREATER_EQUAL "12") set(SIMGRID_DEP "${SIMGRID_DEP} -lpgmath") endif() - if ("${CMAKE_SYSTEM_VERSION}" MATCHES "12\.1") + if ("${CMAKE_SYSTEM_VERSION}" MATCHES "12\\.1") set(SIMGRID_DEP "${SIMGRID_DEP} -lomp") endif() endif() diff --git a/tools/cmake/Modules/FindNS3.cmake b/tools/cmake/Modules/FindNS3.cmake index 4338dbdb50..b97e23540f 100644 --- a/tools/cmake/Modules/FindNS3.cmake +++ b/tools/cmake/Modules/FindNS3.cmake @@ -29,10 +29,10 @@ if(NS3_FOUND) # Starting from 3.36, ns3 provides a working pkg-config file, maki endforeach() set(NS3_VERSION "${NS3_ns3-core_VERSION}") - string(REGEX REPLACE "3.([.0-9\-a-z]+)" "\\1" NS3_MINOR_VERSION "${NS3_VERSION}") - if(NS3_MINOR_VERSION MATCHES ".") - string(REGEX REPLACE "^[0-9]*\.([0-9]+$)" "\\1" NS3_PATCH_VERSION "${NS3_MINOR_VERSION}") - string(REGEX REPLACE "^([0-9]+)\.[0-9]*$" "\\1" NS3_MINOR_VERSION "${NS3_MINOR_VERSION}") + string(REGEX REPLACE "3\\.([-.0-9a-z]+)" "\\1" NS3_MINOR_VERSION "${NS3_VERSION}") + if(NS3_MINOR_VERSION MATCHES "\\.") + string(REGEX REPLACE "^[0-9]*\\.([0-9]+$)" "\\1" NS3_PATCH_VERSION "${NS3_MINOR_VERSION}") + string(REGEX REPLACE "^([0-9]+)\\.[0-9]*$" "\\1" NS3_MINOR_VERSION "${NS3_MINOR_VERSION}") else() set(NS3_PATCH_VERSION "0") endif() @@ -94,13 +94,13 @@ else() endif() message(STATUS "ns-3 found ${NS3_LIBRARIES}") string(REGEX REPLACE ".*libns(.*)-core.*" "\\1" NS3_VERSION "${NS3_LIBRARIES}") - string(REGEX REPLACE "3.([.0-9\-a-z]+)" "\\1" NS3_MINOR_VERSION "${NS3_VERSION}") + string(REGEX REPLACE "3\\.([-.0-9a-z]+)" "\\1" NS3_MINOR_VERSION "${NS3_VERSION}") if(NS3_MINOR_VERSION MATCHES "dev") set(NS3_MINOR_VERSION "99") endif() - if(NS3_MINOR_VERSION MATCHES ".") - string(REGEX REPLACE "^[0-9]*\.([0-9]+$)" "\\1" NS3_PATCH_VERSION "${NS3_MINOR_VERSION}") - string(REGEX REPLACE "^([0-9]+)\.[0-9]*$" "\\1" NS3_MINOR_VERSION "${NS3_MINOR_VERSION}") + if(NS3_MINOR_VERSION MATCHES "\\.") + string(REGEX REPLACE "^[0-9]*\\.([0-9]+$)" "\\1" NS3_PATCH_VERSION "${NS3_MINOR_VERSION}") + string(REGEX REPLACE "^([0-9]+)\\.[0-9]*$" "\\1" NS3_MINOR_VERSION "${NS3_MINOR_VERSION}") else() set(NS3_PATCH_VERSION "0") endif() -- 2.20.1