From bd4a354f9a5d9f6dc92d23659daf3d10806b550c Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Sun, 14 Jun 2020 13:00:36 +0200
Subject: [PATCH] Fix ENABLE_CLANG_TIDY option

---
 .../PVT/gnuradio_blocks/CMakeLists.txt           |  1 +
 src/algorithms/PVT/libs/CMakeLists.txt           | 16 ++--------------
 src/core/monitor/CMakeLists.txt                  | 15 +--------------
 3 files changed, 4 insertions(+), 28 deletions(-)

diff --git a/src/algorithms/PVT/gnuradio_blocks/CMakeLists.txt b/src/algorithms/PVT/gnuradio_blocks/CMakeLists.txt
index 87fb80cd9..b1cc195a9 100644
--- a/src/algorithms/PVT/gnuradio_blocks/CMakeLists.txt
+++ b/src/algorithms/PVT/gnuradio_blocks/CMakeLists.txt
@@ -37,6 +37,7 @@ target_link_libraries(pvt_gr_blocks
         Gnuradio::pmt
         Gnuradio::runtime
     PRIVATE
+        algorithms_libs
         pvt_libs
         Gflags::gflags
         Glog::glog
diff --git a/src/algorithms/PVT/libs/CMakeLists.txt b/src/algorithms/PVT/libs/CMakeLists.txt
index 4daa5f6f0..a7e2d0880 100644
--- a/src/algorithms/PVT/libs/CMakeLists.txt
+++ b/src/algorithms/PVT/libs/CMakeLists.txt
@@ -77,9 +77,9 @@ target_link_libraries(pvt_libs
         Boost::date_time
         protobuf::libprotobuf
         core_system_parameters
+        algorithms_libs_rtklib
     PRIVATE
         algorithms_libs
-        algorithms_libs_rtklib
         Gflags::gflags
         Glog::glog
         Matio::matio
@@ -104,7 +104,7 @@ endif()
 if(USE_BOOST_ASIO_IO_CONTEXT)
     target_compile_definitions(pvt_libs
         PUBLIC
-            -DUSE_BOOST_ASIO_IO_CONTEXT
+            -DUSE_BOOST_ASIO_IO_CONTEXT=1
     )
 endif()
 
@@ -125,18 +125,6 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
     endif()
 endif()
 
-if(ENABLE_CLANG_TIDY)
-    if(CLANG_TIDY_EXE)
-        set_target_properties(pvt_libs
-            PROPERTIES
-                CXX_CLANG_TIDY "${DO_CLANG_TIDY}"
-        )
-    endif()
-endif()
-
 set_property(TARGET pvt_libs APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
-    $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/src/algorithms/libs>
-    $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/src/algorithms/libs/rtklib>
-    $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/src/core/system_parameters>
 )
diff --git a/src/core/monitor/CMakeLists.txt b/src/core/monitor/CMakeLists.txt
index 02d73304f..8c508a985 100644
--- a/src/core/monitor/CMakeLists.txt
+++ b/src/core/monitor/CMakeLists.txt
@@ -71,11 +71,10 @@ endif()
 if(USE_BOOST_ASIO_IO_CONTEXT)
     target_compile_definitions(core_monitor
         PUBLIC
-            -DUSE_BOOST_ASIO_IO_CONTEXT
+            -DUSE_BOOST_ASIO_IO_CONTEXT=1
     )
 endif()
 
-
 # Fix for Boost Asio < 1.70
 if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
     if((CMAKE_CXX_COMPILER_ID MATCHES "Clang") AND (Boost_VERSION_STRING VERSION_LESS 1.70.0))
@@ -93,19 +92,7 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
     endif()
 endif()
 
-
-if(ENABLE_CLANG_TIDY)
-    if(CLANG_TIDY_EXE)
-        set_target_properties(core_monitor
-            PROPERTIES
-                CXX_CLANG_TIDY "${DO_CLANG_TIDY}"
-        )
-    endif()
-endif()
-
-
 set_property(TARGET core_monitor
     APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
-        $<BUILD_INTERFACE:${PROTO_INCLUDE_HEADERS}>
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
 )