From 30d162c76a7d24feb175dd0d69ad1ca5e4f1e390 Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Sat, 17 Nov 2018 19:26:06 +0100
Subject: [PATCH] Get rid of deprecated link_libraries()

---
 CMakeLists.txt                         | 4 ++--
 src/main/CMakeLists.txt                | 1 +
 src/tests/CMakeLists.txt               | 9 ++++++---
 src/utils/front-end-cal/CMakeLists.txt | 3 ++-
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 18379951d..0c8dbb11f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -433,7 +433,7 @@ endif(NOT ENABLE_GENERIC_ARCH)
 ################################################################################
 if(CMAKE_VERSION VERSION_LESS 3.1)
     find_package(Threads REQUIRED)
-    link_libraries(${CMAKE_THREAD_LIBS_INIT})
+    set(THREAD_LIBRARIES ${CMAKE_THREAD_LIBS_INIT})
 else(CMAKE_VERSION VERSION_LESS 3.1)
     set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
     if(CMAKE_CROSSCOMPILING)
@@ -442,7 +442,7 @@ else(CMAKE_VERSION VERSION_LESS 3.1)
         set(THREADS_PREFER_PTHREAD_FLAG TRUE)
     endif(CMAKE_CROSSCOMPILING)
     find_package(Threads REQUIRED)
-    link_libraries(Threads::Threads)
+    set(THREAD_LIBRARIES Threads::Threads)
 endif(CMAKE_VERSION VERSION_LESS 3.1)
 
 
diff --git a/src/main/CMakeLists.txt b/src/main/CMakeLists.txt
index eaf6eff43..4dff21617 100644
--- a/src/main/CMakeLists.txt
+++ b/src/main/CMakeLists.txt
@@ -82,6 +82,7 @@ add_custom_command(TARGET gnss-sdr POST_BUILD
                            ${CMAKE_SOURCE_DIR}/install/$<TARGET_FILE_NAME:gnss-sdr> )
 
 target_link_libraries(gnss-sdr ${MAC_LIBRARIES}
+                               ${THREAD_LIBRARIES}
                                ${Boost_LIBRARIES}
                                ${GNURADIO_RUNTIME_LIBRARIES}
                                ${GNURADIO_BLOCKS_LIBRARIES}
diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
index 5bcd5729f..70778c279 100644
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -95,7 +95,7 @@ if(NOT ${GTEST_DIR_LOCAL})
      set(GTEST_LIBRARIES
           ${binary_dir}/googletest/${CMAKE_FIND_LIBRARY_PREFIXES}gtest${CMAKE_STATIC_LIBRARY_SUFFIX}
           ${binary_dir}/googletest/${CMAKE_FIND_LIBRARY_PREFIXES}gtest_main${CMAKE_STATIC_LIBRARY_SUFFIX}
-     )
+          ${THREAD_LIBRARIES} )
      set(GTEST_LIB_DIR "${CMAKE_CURRENT_BINARY_DIR}/../../gtest-${GNSSSDR_GTEST_LOCAL_VERSION}/googletest")
 else(NOT ${GTEST_DIR_LOCAL})
      if(GTEST_INCLUDE_DIRS)
@@ -109,6 +109,7 @@ else(NOT ${GTEST_DIR_LOCAL})
           add_library(gtest ${GTEST_DIR}/src/gtest-all.cc ${GTEST_DIR}/src/gtest_main.cc)
           set(GTEST_LIBRARIES gtest)
      endif(GTEST_INCLUDE_DIRS)
+     target_link_libraries(gtest ${THREAD_LIBRARIES})
 endif(NOT ${GTEST_DIR_LOCAL})
 
 
@@ -495,6 +496,7 @@ if(ENABLE_SYSTEM_TESTING)
     if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
         set(HOST_SYSTEM "GNU/Linux ${LINUX_DISTRIBUTION} ${LINUX_VER} ${ARCH_}")
         string(REPLACE "\n" "" HOST_SYSTEM "${HOST_SYSTEM}")
+        string(REPLACE "\"" "" HOST_SYSTEM "${HOST_SYSTEM}")
     endif(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
     if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
         set(HOST_SYSTEM "MacOS")
@@ -502,7 +504,7 @@ if(ENABLE_SYSTEM_TESTING)
     add_definitions(-DHOST_SYSTEM="${HOST_SYSTEM}")
 
     #### TTFF
-    set(OPT_LIBS_ ${Boost_LIBRARIES} ${GFlags_LIBS} ${GLOG_LIBRARIES}
+    set(OPT_LIBS_ ${Boost_LIBRARIES} ${THREAD_LIBRARIES} ${GFlags_LIBS} ${GLOG_LIBRARIES}
                   ${GNURADIO_RUNTIME_LIBRARIES} ${GTEST_LIBRARIES}
                   ${GNURADIO_BLOCKS_LIBRARIES} ${GNURADIO_FILTER_LIBRARIES}
                   ${GNURADIO_ANALOG_LIBRARIES} gnss_sp_libs
@@ -512,7 +514,7 @@ if(ENABLE_SYSTEM_TESTING)
 
     if(ENABLE_SYSTEM_TESTING_EXTRA)
         #### POSITION_TEST
-        set(OPT_LIBS_ ${Boost_LIBRARIES} ${GFlags_LIBS} ${GLOG_LIBRARIES}
+        set(OPT_LIBS_ ${Boost_LIBRARIES} ${THREAD_LIBRARIES} ${GFlags_LIBS} ${GLOG_LIBRARIES}
                       ${GTEST_LIBRARIES} ${GNURADIO_RUNTIME_LIBRARIES}
                       ${GNURADIO_BLOCKS_LIBRARIES} ${GNURADIO_FILTER_LIBRARIES}
                       ${GNURADIO_ANALOG_LIBRARIES} ${VOLK_GNSSSDR_LIBRARIES}
@@ -601,6 +603,7 @@ if(NOT ${GTEST_DIR_LOCAL})
 else(NOT ${GTEST_DIR_LOCAL})
     add_dependencies(gnss_block_test gtest)
 endif(NOT ${GTEST_DIR_LOCAL})
+set_property(TEST gnss_block_test PROPERTY TIMEOUT 60)
 
 #########################################################
 
diff --git a/src/utils/front-end-cal/CMakeLists.txt b/src/utils/front-end-cal/CMakeLists.txt
index 151acf2b0..a9d1d455a 100644
--- a/src/utils/front-end-cal/CMakeLists.txt
+++ b/src/utils/front-end-cal/CMakeLists.txt
@@ -32,7 +32,7 @@ include_directories(
     ${CMAKE_SOURCE_DIR}/src/core/libs
     ${CMAKE_SOURCE_DIR}/src/core/libs/supl
     ${CMAKE_SOURCE_DIR}/src/core/libs/supl/asn-rrlp
-	${CMAKE_SOURCE_DIR}/src/core/libs/supl/asn-supl
+    ${CMAKE_SOURCE_DIR}/src/core/libs/supl/asn-supl
     ${CMAKE_SOURCE_DIR}/src/algorithms/acquisition/adapters
     ${CMAKE_SOURCE_DIR}/src/algorithms/acquisition/gnuradio_blocks
     ${CMAKE_SOURCE_DIR}/src/algorithms/acquisition/libs
@@ -51,6 +51,7 @@ add_library(front_end_cal_lib ${FRONT_END_CAL_SOURCES} ${FRONT_END_CAL_HEADERS})
 source_group(Headers FILES ${FRONT_END_CAL_HEADERS})
 
 target_link_libraries(front_end_cal_lib ${MAC_LIBRARIES}
+                                        ${THREAD_LIBRARIES}
                                         ${Boost_LIBRARIES}
                                         ${GNURADIO_RUNTIME_LIBRARIES}
                                         ${GNURADIO_BLOCKS_LIBRARIES}