eosswedenorg/antelope-keygen
1
0
Fork 0
mirror of https://github.com/eosswedenorg/antelope-keygen synced 2026-07-03 11:53:41 +02:00
Code Issues Releases Activity

CMakeModules/libeoskeygen.cmake: allow LIBEOSKEYGEN_WANTED_VERSION to contain a git branch.

Browse source
This commit is contained in:
Henrik Hautakoski 2020-03-25 18:47:49 +01:00
parent cf082919cc
commit 9f28dfcc29
1 changed files with 13 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
CMakeModules/libeoskeygen.cmake
View file

@ -30,6 +30,9 @@ endmacro()
if (LIBEOSKEYGEN_SOURCE_DIR) if (LIBEOSKEYGEN_SOURCE_DIR)
buildLocal( ${LIBEOSKEYGEN_SOURCE_DIR} ) buildLocal( ${LIBEOSKEYGEN_SOURCE_DIR} )
else() else()
# Check if version is in fact a version.
if (LIBEOSKEYGEN_WANTED_VERSION MATCHES "^[0-9]+(.[0-9]+)?(.[0-9]+)(-[a-zA-Z0-9]+)?$")
# Try finding the package on the system. # Try finding the package on the system.
find_package(libeoskeygen ${LIBEOSKEYGEN_WANTED_VERSION} QUIET) find_package(libeoskeygen ${LIBEOSKEYGEN_WANTED_VERSION} QUIET)
if (libeoskeygen_FOUND) if (libeoskeygen_FOUND)
@ -38,4 +41,8 @@ else()
else() else()
fromGit( v${LIBEOSKEYGEN_WANTED_VERSION} ) fromGit( v${LIBEOSKEYGEN_WANTED_VERSION} )
endif() endif()
# Assume version contains a git branch.
else()
fromGit( ${LIBEOSKEYGEN_WANTED_VERSION} )
endif()
endif() endif()