From 74950e9856b973110cdba7e87d79723ef635bec2 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Tue, 5 Feb 2019 02:21:56 +0100 Subject: [PATCH] Set some compile definitions to private --- src/algorithms/PVT/libs/CMakeLists.txt | 2 +- src/algorithms/libs/CMakeLists.txt | 8 ++------ src/algorithms/libs/rtklib/CMakeLists.txt | 2 -- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/src/algorithms/PVT/libs/CMakeLists.txt b/src/algorithms/PVT/libs/CMakeLists.txt index 8aa17735a..9b9237128 100644 --- a/src/algorithms/PVT/libs/CMakeLists.txt +++ b/src/algorithms/PVT/libs/CMakeLists.txt @@ -77,7 +77,7 @@ target_include_directories(pvt_lib ${CMAKE_SOURCE_DIR}/src/algorithms/libs/rtklib ) -target_compile_definitions(pvt_lib PUBLIC -DGNSS_SDR_VERSION="${VERSION}") +target_compile_definitions(pvt_lib PRIVATE -DGNSS_SDR_VERSION="${VERSION}") set_property(TARGET pvt_lib APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES $ diff --git a/src/algorithms/libs/CMakeLists.txt b/src/algorithms/libs/CMakeLists.txt index 6efef8079..d4c0e73fd 100644 --- a/src/algorithms/libs/CMakeLists.txt +++ b/src/algorithms/libs/CMakeLists.txt @@ -129,10 +129,6 @@ target_compile_definitions(gnss_sp_libs PUBLIC -DGNSSSDR_INSTALL_DIR="${CMAKE_INSTALL_PREFIX}" ) -if(${GFLAGS_GREATER_20}) - target_compile_definitions(gnss_sp_libs PUBLIC -DGFLAGS_GREATER_2_0=1) -endif() - set_property(TARGET gnss_sp_libs APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES $ @@ -153,11 +149,11 @@ target_link_libraries(gnss_sdr_flags ) if(${GFLAGS_GREATER_20}) - target_compile_definitions(gnss_sdr_flags PUBLIC -DGFLAGS_GREATER_2_0=1) + target_compile_definitions(gnss_sdr_flags PRIVATE -DGFLAGS_GREATER_2_0=1) endif() target_compile_definitions(gnss_sdr_flags - PUBLIC -DGNSSSDR_INSTALL_DIR="${CMAKE_INSTALL_PREFIX}" + PRIVATE -DGNSSSDR_INSTALL_DIR="${CMAKE_INSTALL_PREFIX}" ) set_property(TARGET gnss_sdr_flags diff --git a/src/algorithms/libs/rtklib/CMakeLists.txt b/src/algorithms/libs/rtklib/CMakeLists.txt index 22d3b198e..c1808b1b8 100644 --- a/src/algorithms/libs/rtklib/CMakeLists.txt +++ b/src/algorithms/libs/rtklib/CMakeLists.txt @@ -81,8 +81,6 @@ target_link_libraries(rtklib_lib ${MAC_LIBRARIES} ) -target_compile_definitions(rtklib_lib PUBLIC -DGNSS_SDR_VERSION="${VERSION}") - set_property(TARGET rtklib_lib APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES $