From 4d77c8237701f6e65fcab4a2a237a21180d59f4d Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Thu, 16 Jan 2020 16:11:03 +0100 Subject: [PATCH] Fix cgal_create_release_with_cmake.cmake --- .../developer_scripts/cgal_create_release_with_cmake.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Scripts/developer_scripts/cgal_create_release_with_cmake.cmake b/Scripts/developer_scripts/cgal_create_release_with_cmake.cmake index 38905c3e239..16a584ad6eb 100644 --- a/Scripts/developer_scripts/cgal_create_release_with_cmake.cmake +++ b/Scripts/developer_scripts/cgal_create_release_with_cmake.cmake @@ -79,7 +79,7 @@ if (NOT EXISTS ${GIT_REPO}/Installation/include/CGAL/version.h) endif() file(READ "${GIT_REPO}/Installation/include/CGAL/version.h" version_file_content) -string(REGEX MATCH "define CGAL_VERSION (.*)\n#define CGAL_VERSION_NR" CGAL_VERSION_FOUND "${version_file_content}") +string(REGEX MATCH "define CGAL_VERSION ([^\n]*)\n" CGAL_VERSION_FOUND "${version_file_content}") if (CGAL_VERSION_FOUND) set(CGAL_VERSION_INPUT "${CMAKE_MATCH_1}") @@ -171,12 +171,12 @@ if(EXISTS ${GIT_REPO}/.git) RESULT_VARIABLE RESULT_VAR OUTPUT_VARIABLE OUT_VAR ) - string(REPLACE "CGAL_GIT_HASH abcdef\n" "CGAL_GIT_HASH ${OUT_VAR}" file_content "${file_content}") + string(REGEX REPLACE "CGAL_GIT_HASH [^\n]*\n" "CGAL_GIT_HASH ${OUT_VAR}" file_content "${file_content}") endif() # update CGAL_RELEASE_DATE string(TIMESTAMP TODAY "%Y%m%d") string(TIMESTAMP TODAY_FOR_MANPAGES "%B %Y") -string(REPLACE "CGAL_RELEASE_DATE 20170101" "CGAL_RELEASE_DATE ${TODAY}" file_content "${file_content}") +string(REGEX REPLACE "CGAL_RELEASE_DATE [^\n]*" "CGAL_RELEASE_DATE ${TODAY}" file_content "${file_content}") # update CGAL_VERSION string(REPLACE "CGAL_VERSION ${CGAL_VERSION_INPUT}" "CGAL_VERSION ${CGAL_VERSION}" file_content "${file_content}") # update CGAL_VERSION_NR