From 05ec821998fba032e3e43fcdc2309d81e3188b4f Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Tue, 20 Aug 2019 23:02:48 +0200
Subject: [PATCH] Update GPSTK version to 2.12

Fix ENABLE_OWN_GPSTK option if GPSTK was already found
---
 CMakeLists.txt                |  2 +-
 cmake/Modules/FindGPSTK.cmake |  6 +++---
 src/tests/CMakeLists.txt      | 22 +++++++++++-----------
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index de47c6944..3e2670c13 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -403,7 +403,7 @@ set(GNSSSDR_GLOG_LOCAL_VERSION "0.4.0")
 set(GNSSSDR_ARMADILLO_LOCAL_VERSION "9.600.x")
 set(GNSSSDR_GTEST_LOCAL_VERSION "1.8.1")
 set(GNSSSDR_GNSS_SIM_LOCAL_VERSION "master")
-set(GNSSSDR_GPSTK_LOCAL_VERSION "2.10.6")
+set(GNSSSDR_GPSTK_LOCAL_VERSION "2.12")
 set(GNSSSDR_MATIO_LOCAL_VERSION "1.5.17")
 set(GNSSSDR_PUGIXML_LOCAL_VERSION "1.9")
 set(GNSSSDR_PROTOCOLBUFFERS_LOCAL_VERSION "3.9.1")
diff --git a/cmake/Modules/FindGPSTK.cmake b/cmake/Modules/FindGPSTK.cmake
index 65814c635..cf61cb2ff 100644
--- a/cmake/Modules/FindGPSTK.cmake
+++ b/cmake/Modules/FindGPSTK.cmake
@@ -79,9 +79,7 @@ set_package_properties(GPSTK PROPERTIES
     URL "http://www.gpstk.org"
 )
 
-mark_as_advanced(GPSTK_LIBRARY GPSTK_INCLUDE_DIR)
-
-if(GPSTK_FOUND AND NOT TARGET Gpstk::gpstk)
+if(GPSTK_FOUND AND NOT ENABLE_OWN_GPSTK AND NOT TARGET Gpstk::gpstk)
     add_library(Gpstk::gpstk SHARED IMPORTED)
     set_target_properties(Gpstk::gpstk PROPERTIES
         IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
@@ -90,3 +88,5 @@ if(GPSTK_FOUND AND NOT TARGET Gpstk::gpstk)
         INTERFACE_LINK_LIBRARIES "${GPSTK_LIBRARY}"
     )
 endif()
+
+mark_as_advanced(GPSTK_LIBRARY GPSTK_INCLUDE_DIR)
diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
index ff6b7f46d..e0031108e 100644
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -194,12 +194,6 @@ endif()
 # GPSTk and optional generator
 ################################################################################
 
-find_package(GPSTK)
-set_package_properties(GPSTK PROPERTIES
-    PURPOSE "Used in some Extra Tests."
-    TYPE OPTIONAL
-)
-
 if(ENABLE_UNIT_TESTING_EXTRA OR ENABLE_SYSTEM_TESTING_EXTRA OR ENABLE_FPGA)
     if(ENABLE_FPGA)
         set(CROSS_INSTALL_DIR "-DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}")
@@ -241,11 +235,18 @@ if(ENABLE_UNIT_TESTING_EXTRA OR ENABLE_SYSTEM_TESTING_EXTRA OR ENABLE_FPGA)
         endif()
     endif()
 
-    ################################################################################
-    # Local installation of GPSTk http://www.gpstk.org/
-    ################################################################################
+    ############################################################################
+    # Local installation of GPSTk https://github.com/SGL-UT/GPSTk
+    ############################################################################
+    find_package(GPSTK)
+    set_package_properties(GPSTK PROPERTIES
+        PURPOSE "Used in some Extra Tests."
+        TYPE REQUIRED
+    )
     if(NOT GPSTK_FOUND OR ENABLE_OWN_GPSTK)
-        message(STATUS " GPSTk v${GNSSSDR_GPSTK_LOCAL_VERSION} will be automatically downloaded and built when doing 'make'.")
+        set_package_properties(GPSTK PROPERTIES
+            PURPOSE "GPSTk v${GNSSSDR_GPSTK_LOCAL_VERSION} will be automatically downloaded and built when doing '${CMAKE_MAKE_PROGRAM_PRETTY_NAME}'."
+        )
         if("${TOOLCHAIN_ARG}" STREQUAL "")
             set(TOOLCHAIN_ARG "-DCMAKE_CXX_FLAGS=-Wno-deprecated")
             set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated")
@@ -277,7 +278,6 @@ if(ENABLE_UNIT_TESTING_EXTRA OR ENABLE_SYSTEM_TESTING_EXTRA OR ENABLE_FPGA)
         set(GPSTK_LIBRARY ${CMAKE_CURRENT_SOURCE_DIR}/../../thirdparty/gpstk-${GNSSSDR_GPSTK_LOCAL_VERSION}/install/${CMAKE_INSTALL_LIBDIR}/${CMAKE_FIND_LIBRARY_PREFIXES}gpstk${CMAKE_SHARED_LIBRARY_SUFFIX})
         set(GPSTK_BINDIR ${CMAKE_CURRENT_SOURCE_DIR}/../../thirdparty/gpstk-${GNSSSDR_GPSTK_LOCAL_VERSION}/install/bin/)
         add_definitions(-DGPSTK_BINDIR="${GPSTK_BINDIR}")
-        set(OWN_GPSTK True)
         add_library(Gpstk::gpstk SHARED IMPORTED)
         add_dependencies(Gpstk::gpstk gpstk-${GNSSSDR_GPSTK_LOCAL_VERSION})
         file(MAKE_DIRECTORY ${GPSTK_INCLUDE_DIRS})