From a1f77607c3baacf1c4c5d5019289613dc29195dc Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Thu, 16 May 2019 20:49:10 +0200 Subject: [PATCH] Fix building in some macOS configurations --- src/algorithms/PVT/libs/CMakeLists.txt | 2 +- src/algorithms/signal_source/gnuradio_blocks/CMakeLists.txt | 2 +- src/algorithms/tracking/libs/CMakeLists.txt | 2 +- src/core/monitor/CMakeLists.txt | 2 +- src/core/receiver/CMakeLists.txt | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/algorithms/PVT/libs/CMakeLists.txt b/src/algorithms/PVT/libs/CMakeLists.txt index d4df48600..23eacf787 100644 --- a/src/algorithms/PVT/libs/CMakeLists.txt +++ b/src/algorithms/PVT/libs/CMakeLists.txt @@ -95,7 +95,7 @@ if(Boost_VERSION VERSION_GREATER "106599") endif() if(OS_IS_MACOSX) - if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") # not AppleClang + if(CMAKE_CXX_COMPILER_ID MATCHES "Clang") target_compile_definitions(pvt_libs PUBLIC -DBOOST_ASIO_HAS_STD_STRING_VIEW diff --git a/src/algorithms/signal_source/gnuradio_blocks/CMakeLists.txt b/src/algorithms/signal_source/gnuradio_blocks/CMakeLists.txt index b32774dd9..ca38c48a7 100644 --- a/src/algorithms/signal_source/gnuradio_blocks/CMakeLists.txt +++ b/src/algorithms/signal_source/gnuradio_blocks/CMakeLists.txt @@ -77,7 +77,7 @@ if(ENABLE_RAW_UDP AND PCAP_FOUND) endif() if(OS_IS_MACOSX) - if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") # not AppleClang + if(CMAKE_CXX_COMPILER_ID MATCHES "Clang") target_compile_definitions(signal_source_gr_blocks PUBLIC -DBOOST_ASIO_HAS_STD_STRING_VIEW diff --git a/src/algorithms/tracking/libs/CMakeLists.txt b/src/algorithms/tracking/libs/CMakeLists.txt index 63de5d9a7..d30feeaa5 100644 --- a/src/algorithms/tracking/libs/CMakeLists.txt +++ b/src/algorithms/tracking/libs/CMakeLists.txt @@ -101,7 +101,7 @@ if(Boost_VERSION VERSION_GREATER "106599") endif() if(OS_IS_MACOSX) - if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") # not AppleClang + if(CMAKE_CXX_COMPILER_ID MATCHES "Clang") target_compile_definitions(tracking_libs PUBLIC -DBOOST_ASIO_HAS_STD_STRING_VIEW diff --git a/src/core/monitor/CMakeLists.txt b/src/core/monitor/CMakeLists.txt index aa8ee4daa..0982685ad 100644 --- a/src/core/monitor/CMakeLists.txt +++ b/src/core/monitor/CMakeLists.txt @@ -69,7 +69,7 @@ endif() if(OS_IS_MACOSX) - if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") # not AppleClang + if(CMAKE_CXX_COMPILER_ID MATCHES "Clang") target_compile_definitions(core_monitor PUBLIC -DBOOST_ASIO_HAS_STD_STRING_VIEW diff --git a/src/core/receiver/CMakeLists.txt b/src/core/receiver/CMakeLists.txt index 4cfca1f29..af0c4a2f2 100644 --- a/src/core/receiver/CMakeLists.txt +++ b/src/core/receiver/CMakeLists.txt @@ -163,7 +163,7 @@ target_link_libraries(core_receiver ) if(OS_IS_MACOSX) - if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") # not AppleClang + if(CMAKE_CXX_COMPILER_ID MATCHES "Clang") target_compile_definitions(core_receiver PUBLIC -DBOOST_ASIO_HAS_STD_STRING_VIEW