From 6c8cd94f1419458713543ada013f6b2413afc183 Mon Sep 17 00:00:00 2001 From: Michael Dickens Date: Wed, 24 Sep 2014 13:27:25 -0400 Subject: cmake: set ENV variables to tell GR's FindUHD.cmake that these files were actually used; UHDConfig*.cmake are not always allowed to use CACHE variables, thus the use of ENV. --- host/cmake/Modules/UHDConfig.cmake | 7 +++++++ host/cmake/Modules/UHDConfigVersion.cmake.in | 6 ++++++ 2 files changed, 13 insertions(+) (limited to 'host/cmake/Modules') diff --git a/host/cmake/Modules/UHDConfig.cmake b/host/cmake/Modules/UHDConfig.cmake index f68bc2f1e..cf841cc85 100644 --- a/host/cmake/Modules/UHDConfig.cmake +++ b/host/cmake/Modules/UHDConfig.cmake @@ -28,6 +28,13 @@ # ######################################################################## +# set that this file was found, for use in GNU Radio's FindUHD.cmake. +# Have to use the ENV, since this file might not allow CACHE changes. + +set(ENV{UHD_CONFIG_USED} TRUE) + +# set default values + SET(UHD_FOUND TRUE) SET(UHD_INCLUDE_HINTS) SET(UHD_LIBDIR_HINTS) diff --git a/host/cmake/Modules/UHDConfigVersion.cmake.in b/host/cmake/Modules/UHDConfigVersion.cmake.in index d9b30a7e2..3d09687e1 100644 --- a/host/cmake/Modules/UHDConfigVersion.cmake.in +++ b/host/cmake/Modules/UHDConfigVersion.cmake.in @@ -21,6 +21,11 @@ # provided by this UHD install. All version checking is done herein. ######################################################################## +# set that this file was found, for use in GNU Radio's FindUHD.cmake. +# Have to use the ENV, since this file might not allow CACHE changes. + +set(ENV{UHD_CONFIG_VERSION_USED} TRUE) + # version values as set in cmake/Modules/UHDVersion.cmake, placed # statically in here to avoid using Python all over again. @@ -29,6 +34,7 @@ SET(MINOR_VERSION @TRIMMED_VERSION_MINOR@) SET(PATCH_VERSION @TRIMMED_VERSION_PATCH@) SET(PACKAGE_VERSION @TRIMMED_UHD_VERSION@) +SET(ENV{UHD_PACKAGE_VERSION} ${PACKAGE_VERSION}) # There is a bug in CMake whereby calling "find_package(FOO)" within # "find_package(FOO)" results in the version being checked in the -- cgit v1.2.3