From 35d24cefa4fba549e737cd99329ae1b17dd0156b Mon Sep 17 00:00:00 2001 From: Dylan Simon Date: Tue, 3 Sep 2019 11:44:57 -0400 Subject: [PATCH] Fix cmake RHEL version-matching regex As written it matches an empty string --- cpp/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index bae3b4c2..b5bcd6a4 100644 --- a/cpp/CMakeLists.txt +++ b/cpp/CMakeLists.txt @@ -464,7 +464,7 @@ install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/../RELEASE" DESTINATION "share/doc/ge if(${DISTRIBUTOR_ID} MATCHES "Ubuntu" OR ${DISTRIBUTOR_ID} MATCHES "Debian") SET(CPACK_GENERATOR "DEB") ELSEIF(${DISTRIBUTOR_ID} MATCHES "RedHat" OR ${DISTRIBUTOR_ID} MATCHES "CentOS") - string(REGEX MATCH "[0-9]*" RH_VERSION ${DISTRIBUTOR_RELEASE}) + string(REGEX MATCH "[0-9]+" RH_VERSION ${DISTRIBUTOR_RELEASE}) SET(DISTRIBUTION_CODENAME "el${RH_VERSION}") SET(CPACK_GENERATOR "RPM") ELSE()