diff --git a/contrib/Findsodium.cmake b/contrib/Findsodium.cmake index 92797e5b..a124f1c8 100644 --- a/contrib/Findsodium.cmake +++ b/contrib/Findsodium.cmake @@ -18,6 +18,7 @@ # Once done the following variables will be defined: # # sodium_FOUND sodium_INCLUDE_DIR sodium_LIBRARY_DEBUG sodium_LIBRARY_RELEASE +# sodium_VERSION_STRING # # Furthermore an imported "sodium" target is created. # @@ -206,16 +207,17 @@ endif() # extract sodium version if(sodium_INCLUDE_DIR) - set(_VERSION_HEADER "${_INCLUDE_DIR}/sodium/version.h") - if(EXISTS _VERSION_HEADER) + set(_VERSION_HEADER "${sodium_INCLUDE_DIR}/sodium/version.h") + if(EXISTS "${_VERSION_HEADER}") file(READ "${_VERSION_HEADER}" _VERSION_HEADER_CONTENT) string( REGEX - REPLACE ".*#[ \t]*define[ \t]*SODIUM_VERSION_STRING[ \t]*\"([^\n]*)\".*" - "\\1" - sodium_VERSION - "${_VERSION_HEADER_CONTENT}") - set(sodium_VERSION "${sodium_VERSION}" PARENT_SCOPE) + REPLACE + ".*#[ \t]*define[ \t]*sodium_VERSION_STRING_STRING[ \t]*\"([^\n]*)\".*" + "\\1" + sodium_VERSION_STRING + "${_VERSION_HEADER_CONTENT}") + set(sodium_VERSION_STRING "${sodium_VERSION_STRING}") endif() endif() @@ -227,7 +229,7 @@ find_package_handle_standard_args(sodium sodium_LIBRARY_DEBUG sodium_INCLUDE_DIR VERSION_VAR - sodium_VERSION) + sodium_VERSION_STRING) # mark file paths as advanced mark_as_advanced(sodium_INCLUDE_DIR)