From 2f23856a8c99ac5b026f3129f0f521e5f5935799 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Tue, 5 Feb 2019 01:56:26 +0100 Subject: [PATCH 1/2] Minimum Boost version set to 1.53 (e.g. Centos 7) --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 64f8445e8..8b9ffd7fc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -329,7 +329,7 @@ set(GNSSSDR_GCC_MIN_VERSION "4.7.2") set(GNSSSDR_CLANG_MIN_VERSION "3.4.0") set(GNSSSDR_APPLECLANG_MIN_VERSION "500") set(GNSSSDR_GNURADIO_MIN_VERSION "3.7.3") -set(GNSSSDR_BOOST_MIN_VERSION "1.54") +set(GNSSSDR_BOOST_MIN_VERSION "1.53") set(GNSSSDR_PYTHON_MIN_VERSION "2.7") set(GNSSSDR_PYTHON3_MIN_VERSION "3.4") set(GNSSSDR_MAKO_MIN_VERSION "0.4.2") @@ -490,7 +490,7 @@ if(UNIX AND EXISTS "/usr/lib64") list(APPEND BOOST_LIBRARYDIR "/usr/lib64") # Fedora 64-bit fix endif() set(Boost_ADDITIONAL_VERSIONS - "1.54.0" "1.54" + "1.53.0" "1.53" "1.54.0" "1.54" "1.55.0" "1.55" "1.56.0" "1.56" "1.57.0" "1.57" "1.58.0" "1.58" "1.59.0" "1.59" "1.60.0" "1.60" "1.61.0" "1.61" "1.62.0" "1.62" "1.63.0" "1.63" "1.64.0" "1.64" "1.65.0" "1.65" "1.66.0" "1.66" "1.67.0" "1.67" "1.68.0" "1.68" "1.69.0" "1.69" From 74950e9856b973110cdba7e87d79723ef635bec2 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Tue, 5 Feb 2019 02:21:56 +0100 Subject: [PATCH 2/2] 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 $