From 5d9dea953775ab94468d2557cc9343be77acb1d9 Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Thu, 7 Feb 2019 20:51:50 +0100
Subject: [PATCH] Clean CMake scripts

---
 .../tracking/adapters/CMakeLists.txt          | 18 +++++++------
 .../tracking/gnuradio_blocks/CMakeLists.txt   | 27 +++++++++----------
 2 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/src/algorithms/tracking/adapters/CMakeLists.txt b/src/algorithms/tracking/adapters/CMakeLists.txt
index a7211b02d..b9380c539 100644
--- a/src/algorithms/tracking/adapters/CMakeLists.txt
+++ b/src/algorithms/tracking/adapters/CMakeLists.txt
@@ -26,10 +26,6 @@ if(ENABLE_CUDA)
         ${OPT_TRACKING_ADAPTERS_HEADERS}
         gps_l1_ca_dll_pll_tracking_gpu.h
     )
-    set(OPT_TRACKING_INCLUDE_DIRS
-        ${OPT_TRACKING_INCLUDE_DIRS}
-        ${CUDA_INCLUDE_DIRS}
-    )
 endif()
 
 if(ENABLE_FPGA)
@@ -104,10 +100,16 @@ target_link_libraries(tracking_adapters
         gnss_sdr_flags
 )
 
-target_include_directories(tracking_adapters
-    PUBLIC
-        ${OPT_TRACKING_INCLUDE_DIRS}
-)
+if(ENABLE_CUDA)
+    target_link_libraries(tracking_adapters
+        PUBLIC
+            ${CUDA_LIBRARIES}
+    )
+    target_include_directories(tracking_adapters
+        PUBLIC
+            ${CUDA_INCLUDE_DIRS}
+    )
+endif()
 
 set_property(TARGET tracking_adapters
     APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
diff --git a/src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt b/src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt
index 5451846e2..bf342a553 100644
--- a/src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt
+++ b/src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt
@@ -25,14 +25,6 @@ if(ENABLE_CUDA)
         ${OPT_TRACKING_BLOCKS_HEADERS}
         gps_l1_ca_dll_pll_tracking_gpu_cc.h
     )
-    set(OPT_TRACKING_INCLUDES
-        ${OPT_TRACKING_INCLUDES}
-        ${CUDA_INCLUDE_DIRS}
-    )
-    set(OPT_TRACKING_LIBRARIES
-        ${OPT_TRACKING_LIBRARIES}
-        ${CUDA_LIBRARIES}
-    )
 endif()
 
 if(ENABLE_FPGA)
@@ -91,20 +83,25 @@ add_library(tracking_gr_blocks
 target_link_libraries(tracking_gr_blocks
     PUBLIC
         Boost::boost
-        tracking_lib
         Gnuradio::blocks
+        Matio::matio
         Volkgnsssdr::volkgnsssdr
         gnss_sdr_flags
         gnss_sp_libs
         gnss_rx
-        Matio::matio
-        ${OPT_TRACKING_LIBRARIES}
+        tracking_lib
 )
 
-target_include_directories(tracking_gr_blocks
-    PUBLIC
-        ${OPT_TRACKING_INCLUDES}
-)
+if(ENABLE_CUDA)
+    target_link_libraries(tracking_gr_blocks
+        PUBLIC
+            ${CUDA_LIBRARIES}
+    )
+    target_include_directories(tracking_gr_blocks
+        PUBLIC
+            ${CUDA_INCLUDE_DIRS}
+    )
+endif()
 
 set_property(TARGET tracking_gr_blocks
     APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES