From ce83462f8517b49e9140852a883668e461395bfe Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Mon, 4 Feb 2019 23:26:07 +0100
Subject: [PATCH] Add some fixes to CMake scripts

---
 src/main/CMakeLists.txt               |  1 +
 src/utils/rinex2assist/CMakeLists.txt | 14 +++++++-------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/main/CMakeLists.txt b/src/main/CMakeLists.txt
index 4d4e1d9f6..b154cb855 100644
--- a/src/main/CMakeLists.txt
+++ b/src/main/CMakeLists.txt
@@ -33,6 +33,7 @@ target_link_libraries(gnss-sdr
         Glog::glog
         gnss_rx
         gnss_sdr_flags
+        ${THREAD_LIBRARIES}
         ${MAC_LIBRARIES}
 )
 
diff --git a/src/utils/rinex2assist/CMakeLists.txt b/src/utils/rinex2assist/CMakeLists.txt
index 636f540d7..4f859566d 100644
--- a/src/utils/rinex2assist/CMakeLists.txt
+++ b/src/utils/rinex2assist/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2018  (see AUTHORS file for a list of contributors)
+# Copyright (C) 2012-2019  (see AUTHORS file for a list of contributors)
 #
 # This file is part of GNSS-SDR.
 #
@@ -24,7 +24,6 @@ if(NOT GPSTK_FOUND OR ENABLE_OWN_GPSTK)
     set(GPSTK_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../thirdparty/gpstk-${GNSSSDR_GPSTK_LOCAL_VERSION}/install/include)
 endif()
 
-set(CMAKE_INCLUDE_PATH ${CMAKE_INCLUDE_PATH} ${GPSTK_INCLUDE_DIR}/gpstk)
 
 find_package(Boost COMPONENTS iostreams serialization QUIET)
 if(CMAKE_VERSION VERSION_LESS 3.5)
@@ -56,11 +55,6 @@ find_program(UNCOMPRESS_EXECUTABLE uncompress
 )
 
 if(Boost_FOUND)
-    include_directories(
-        ${GPSTK_INCLUDE_DIR}/gpstk
-        ${GPSTK_INCLUDE_DIR}
-    )
-
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated")
 
     add_executable(rinex2assist ${CMAKE_CURRENT_SOURCE_DIR}/main.cc)
@@ -76,6 +70,12 @@ if(Boost_FOUND)
             gnss_rx
     )
 
+    target_include_directories(rinex2assist
+        PUBLIC
+            ${GPSTK_INCLUDE_DIR}/gpstk
+            ${GPSTK_INCLUDE_DIR}
+    )
+
     if(NOT UNCOMPRESS_EXECUTABLE-NOTFOUND)
         target_compile_definitions(rinex2assist PUBLIC -DUNCOMPRESS_EXECUTABLE="${UNCOMPRESS_EXECUTABLE}")
     else()