Fix ENABLE_CLANG_TIDY option

This commit is contained in:
Carles Fernandez 2020-06-14 13:00:36 +02:00
parent 90c8b8e468
commit bd4a354f9a
No known key found for this signature in database
GPG Key ID: 4C583C52B0C3877D
3 changed files with 4 additions and 28 deletions

View File

@ -37,6 +37,7 @@ target_link_libraries(pvt_gr_blocks
Gnuradio::pmt
Gnuradio::runtime
PRIVATE
algorithms_libs
pvt_libs
Gflags::gflags
Glog::glog

View File

@ -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>
)

View File

@ -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}>
)