use regex to detect if returned url ends with .git

nRF24 · Jun 7, 2021 · 5109a13 · 5109a13
1 parent 5def5e4
commit 5109a13
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/cmake/GetLibInfo.cmake b/cmake/GetLibInfo.cmake
@@ -1,13 +1,13 @@
 # get lib info from the git cmds
 execute_process(COMMAND git config --get remote.origin.url OUTPUT_VARIABLE CMAKE_PROJECT_HOMEPAGE_URL)
 string(STRIP CMAKE_PROJECT_HOMEPAGE_URL ${CMAKE_PROJECT_HOMEPAGE_URL})
-message("URL = ${CMAKE_PROJECT_HOMEPAGE_URL}")
+
 # use URL to get repo owner as Contact/Maintainer name
-string(REGEX REPLACE "^http[s]?://github.com/(.+)/.+\\.git" "\\1" CPACK_PACKAGE_CONTACT "${CMAKE_PROJECT_HOMEPAGE_URL}")
+string(REGEX REPLACE "^http[s]?://github.com/(.+)/.+[\\.git]?.*&" "\\1" CPACK_PACKAGE_CONTACT "${CMAKE_PROJECT_HOMEPAGE_URL}")
 string(STRIP "${CPACK_PACKAGE_CONTACT}" CPACK_PACKAGE_CONTACT)
 
 # use URL to get the repo name as the Lib Name. Note that we don't use the folder name for this
-string(REGEX REPLACE "^http[s]?://github.com/.+/(.+)\\.git" "\\1" LibName "${CMAKE_PROJECT_HOMEPAGE_URL}")
+string(REGEX REPLACE "^http[s]?://github.com/.+/(.+)[\\.git]?.*&" "\\1" LibName "${CMAKE_PROJECT_HOMEPAGE_URL}")
 string(STRIP "${LibName}" LibName)
 
 # convert the LibName to lower case