From 52b70af104d9425cc883117ee29e0adaea151506 Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Thu, 27 Jun 2019 08:47:09 +0200
Subject: [PATCH] Preserve PACKAGE_VERSION variable if it exists

---
 cmake/Modules/FindGFLAGS.cmake    | 4 +++-
 cmake/Modules/FindGNURADIO.cmake  | 4 +++-
 cmake/Modules/FindGPSTK.cmake     | 4 +++-
 cmake/Modules/FindTELEORBIT.cmake | 4 +++-
 cmake/Modules/FindUHD.cmake       | 4 +++-
 cmake/Modules/FindVOLK.cmake      | 4 +++-
 6 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/cmake/Modules/FindGFLAGS.cmake b/cmake/Modules/FindGFLAGS.cmake
index e4d2c204d..91e33411b 100644
--- a/cmake/Modules/FindGFLAGS.cmake
+++ b/cmake/Modules/FindGFLAGS.cmake
@@ -117,6 +117,8 @@ include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(GFLAGS DEFAULT_MSG GFlags_LIBS GFlags_INCLUDE_DIRS)
 
 if(GFLAGS_FOUND)
+    set(OLD_PACKAGE_VERSION ${PACKAGE_VERSION})
+    unset(PACKAGE_VERSION)
     list(GET GFlags_LIBS 0 FIRST_DIR)
     get_filename_component(GFlags_LIBS_DIR ${FIRST_DIR} DIRECTORY)
     if(EXISTS ${GFlags_LIBS_DIR}/cmake/gflags/gflags-config-version.cmake)
@@ -132,7 +134,7 @@ if(GFLAGS_FOUND)
             DESCRIPTION "C++ library that implements commandline flags processing"
         )
     endif()
-    unset(PACKAGE_VERSION)
+    set(PACKAGE_VERSION ${OLD_PACKAGE_VERSION})
 else()
     set_package_properties(GFLAGS PROPERTIES
         DESCRIPTION "C++ library that implements commandline flags processing"
diff --git a/cmake/Modules/FindGNURADIO.cmake b/cmake/Modules/FindGNURADIO.cmake
index 11e173fc9..708590894 100644
--- a/cmake/Modules/FindGNURADIO.cmake
+++ b/cmake/Modules/FindGNURADIO.cmake
@@ -187,6 +187,8 @@ list(REMOVE_DUPLICATES GNURADIO_ALL_INCLUDE_DIRS)
 list(REMOVE_DUPLICATES GNURADIO_ALL_LIBRARIES)
 
 if(NOT PC_GNURADIO_RUNTIME_VERSION)
+    set(OLD_PACKAGE_VERSION ${PACKAGE_VERSION})
+    unset(PACKAGE_VERSION)
     list(GET GNURADIO_BLOCKS_LIBRARIES 0 FIRST_DIR)
     get_filename_component(GNURADIO_BLOCKS_DIR ${FIRST_DIR} DIRECTORY)
     if(EXISTS ${GNURADIO_BLOCKS_DIR}/cmake/gnuradio/GnuradioConfigVersion.cmake)
@@ -198,7 +200,7 @@ if(NOT PC_GNURADIO_RUNTIME_VERSION)
     if(PACKAGE_VERSION)
         set(PC_GNURADIO_RUNTIME_VERSION ${PACKAGE_VERSION})
     endif()
-    unset(PACKAGE_VERSION)
+    set(PACKAGE_VERSION ${OLD_PACKAGE_VERSION})
 endif()
 
 # Trick to find out that GNU Radio is >= 3.7.4 if pkgconfig is not present
diff --git a/cmake/Modules/FindGPSTK.cmake b/cmake/Modules/FindGPSTK.cmake
index 5d7d1bb7a..65814c635 100644
--- a/cmake/Modules/FindGPSTK.cmake
+++ b/cmake/Modules/FindGPSTK.cmake
@@ -54,13 +54,15 @@ include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(GPSTK DEFAULT_MSG GPSTK_LIBRARY GPSTK_INCLUDE_DIR)
 
 if(GPSTK_FOUND)
+    set(OLD_PACKAGE_VERSION ${PACKAGE_VERSION})
+    unset(PACKAGE_VERSION)
     if(EXISTS ${CMAKE_INSTALL_FULL_DATADIR}/cmake/GPSTK/GPSTKConfigVersion.cmake)
         include(${CMAKE_INSTALL_FULL_DATADIR}/cmake/GPSTK/GPSTKConfigVersion.cmake)
     endif()
     if(PACKAGE_VERSION)
         set(GPSTK_VERSION ${PACKAGE_VERSION})
     endif()
-    unset(PACKAGE_VERSION)
+    set(PACKAGE_VERSION ${OLD_PACKAGE_VERSION})
 endif()
 
 if(GPSTK_FOUND AND GPSTK_VERSION)
diff --git a/cmake/Modules/FindTELEORBIT.cmake b/cmake/Modules/FindTELEORBIT.cmake
index cc33ac87b..e26f54c60 100644
--- a/cmake/Modules/FindTELEORBIT.cmake
+++ b/cmake/Modules/FindTELEORBIT.cmake
@@ -60,6 +60,8 @@ if(PC_TELEORBIT_VERSION)
 endif()
 
 if(NOT TELEORBIT_VERSION)
+    set(OLD_PACKAGE_VERSION ${PACKAGE_VERSION})
+    unset(PACKAGE_VERSION)
     list(GET TELEORBIT_LIBRARIES 0 FIRST_DIR)
     get_filename_component(TELEORBIT_LIBRARIES_DIR ${FIRST_DIR} DIRECTORY)
     if(EXISTS ${TELEORBIT_LIBRARIES_DIR}/cmake/teleorbit/TeleorbitConfigVersion.cmake)
@@ -68,7 +70,7 @@ if(NOT TELEORBIT_VERSION)
     if(PACKAGE_VERSION)
         set(TELEORBIT_VERSION ${PACKAGE_VERSION})
     endif()
-    unset(PACKAGE_VERSION)
+    set(PACKAGE_VERSION ${OLD_PACKAGE_VERSION})
 endif()
 
 if(TELEORBIT_FOUND AND TELEORBIT_VERSION)
diff --git a/cmake/Modules/FindUHD.cmake b/cmake/Modules/FindUHD.cmake
index b75532472..57379d6f2 100644
--- a/cmake/Modules/FindUHD.cmake
+++ b/cmake/Modules/FindUHD.cmake
@@ -86,6 +86,8 @@ if(PC_UHD_VERSION)
     set(UHD_VERSION ${PC_UHD_VERSION})
 endif()
 if(NOT PC_UHD_VERSION)
+    set(OLD_PACKAGE_VERSION ${PACKAGE_VERSION})
+    unset(PACKAGE_VERSION)
     list(GET UHD_LIBRARIES 0 FIRST_DIR)
     get_filename_component(UHD_LIBRARIES_DIR ${FIRST_DIR} DIRECTORY)
     if(EXISTS ${UHD_LIBRARIES_DIR}/cmake/uhd/UHDConfigVersion.cmake)
@@ -94,7 +96,7 @@ if(NOT PC_UHD_VERSION)
     if(PACKAGE_VERSION)
         set(UHD_VERSION ${PACKAGE_VERSION})
     endif()
-    unset(PACKAGE_VERSION)
+    set(PACKAGE_VERSION ${OLD_PACKAGE_VERSION})
 endif()
 
 set_package_properties(UHD PROPERTIES
diff --git a/cmake/Modules/FindVOLK.cmake b/cmake/Modules/FindVOLK.cmake
index fc35ebdff..16dbe96c5 100644
--- a/cmake/Modules/FindVOLK.cmake
+++ b/cmake/Modules/FindVOLK.cmake
@@ -88,6 +88,8 @@ if(PC_VOLK_VERSION)
 endif()
 
 if(NOT VOLK_VERSION)
+    set(OLD_PACKAGE_VERSION ${PACKAGE_VERSION})
+    unset(PACKAGE_VERSION)
     list(GET VOLK_LIBRARIES 0 FIRST_DIR)
     get_filename_component(VOLK_LIB_DIR ${FIRST_DIR} DIRECTORY)
     if(EXISTS ${VOLK_LIB_DIR}/cmake/volk/VolkConfigVersion.cmake)
@@ -96,7 +98,7 @@ if(NOT VOLK_VERSION)
     if(PACKAGE_VERSION)
         set(VOLK_VERSION ${PACKAGE_VERSION})
     endif()
-    unset(PACKAGE_VERSION)
+    set(PACKAGE_VERSION ${OLD_PACKAGE_VERSION})
 endif()
 
 set_package_properties(VOLK PROPERTIES