From 95a1f7d6266d2d6cd161c05430c56df322c1863b Mon Sep 17 00:00:00 2001 From: dsc Date: Sat, 11 May 2019 03:50:23 +0200 Subject: [PATCH] Fix Sodium version detection in CMake recipe --- contrib/Findsodium.cmake | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/contrib/Findsodium.cmake b/contrib/Findsodium.cmake index 0667920c..ff7ed9ea 100644 --- a/contrib/Findsodium.cmake +++ b/contrib/Findsodium.cmake @@ -21,6 +21,7 @@ # sodium_INCLUDE_DIR # sodium_LIBRARY_DEBUG # sodium_LIBRARY_RELEASE +# sodium_VERSION # # # Furthermore an imported "sodium" target is created. @@ -213,12 +214,12 @@ 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) + sodium_VERSION "${_VERSION_HEADER_CONTENT}") + set(sodium_VERSION "${sodium_VERSION}") endif() endif()