mirror of
				https://github.com/gnss-sdr/gnss-sdr
				synced 2025-10-30 23:03:05 +00:00 
			
		
		
		
	Fix build with Clang (not AppleClang) on macOS
This commit is contained in:
		| @@ -139,6 +139,14 @@ set_property(TARGET algorithms_libs | |||||||
|         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> |         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> | ||||||
| ) | ) | ||||||
|  |  | ||||||
|  | if(OS_IS_MACOSX) | ||||||
|  |     if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")  # not AppleClang | ||||||
|  |         target_compile_definitions(algorithms_libs | ||||||
|  |             PUBLIC | ||||||
|  |                 -DBOOST_ASIO_HAS_STD_STRING_VIEW | ||||||
|  |         ) | ||||||
|  |     endif() | ||||||
|  | endif() | ||||||
|  |  | ||||||
| ############################################################################### | ############################################################################### | ||||||
|  |  | ||||||
|   | |||||||
| @@ -75,6 +75,15 @@ if(ENABLE_RAW_UDP AND PCAP_FOUND) | |||||||
|     ) |     ) | ||||||
| endif() | endif() | ||||||
|  |  | ||||||
|  | if(OS_IS_MACOSX) | ||||||
|  |     if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")  # not AppleClang | ||||||
|  |         target_compile_definitions(signal_source_gr_blocks | ||||||
|  |             PUBLIC | ||||||
|  |                 -DBOOST_ASIO_HAS_STD_STRING_VIEW | ||||||
|  |         ) | ||||||
|  |     endif() | ||||||
|  | endif() | ||||||
|  |  | ||||||
| set_property(TARGET signal_source_gr_blocks APPEND PROPERTY | set_property(TARGET signal_source_gr_blocks APPEND PROPERTY | ||||||
|     INTERFACE_INCLUDE_DIRECTORIES $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> |     INTERFACE_INCLUDE_DIRECTORIES $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> | ||||||
| ) | ) | ||||||
|   | |||||||
| @@ -91,6 +91,15 @@ target_include_directories(tracking_libs | |||||||
|         ${OPT_TRACKING_INCLUDES} |         ${OPT_TRACKING_INCLUDES} | ||||||
| ) | ) | ||||||
|  |  | ||||||
|  | if(OS_IS_MACOSX) | ||||||
|  |     if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")  # not AppleClang | ||||||
|  |         target_compile_definitions(tracking_libs | ||||||
|  |             PUBLIC | ||||||
|  |                 -DBOOST_ASIO_HAS_STD_STRING_VIEW | ||||||
|  |         ) | ||||||
|  |     endif() | ||||||
|  | endif() | ||||||
|  |  | ||||||
| set_property(TARGET tracking_libs | set_property(TARGET tracking_libs | ||||||
|     APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES |     APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES | ||||||
|         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> |         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> | ||||||
|   | |||||||
| @@ -49,6 +49,15 @@ target_link_libraries(core_monitor | |||||||
|         Gnuradio::pmt |         Gnuradio::pmt | ||||||
| ) | ) | ||||||
|  |  | ||||||
|  | if(OS_IS_MACOSX) | ||||||
|  |     if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")  # not AppleClang | ||||||
|  |         target_compile_definitions(core_monitor | ||||||
|  |             PUBLIC | ||||||
|  |                 -DBOOST_ASIO_HAS_STD_STRING_VIEW | ||||||
|  |         ) | ||||||
|  |     endif() | ||||||
|  | endif() | ||||||
|  |  | ||||||
| set_property(TARGET core_monitor | set_property(TARGET core_monitor | ||||||
|     APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES |     APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES | ||||||
|         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> |         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> | ||||||
|   | |||||||
| @@ -159,6 +159,15 @@ target_link_libraries(core_receiver | |||||||
|         pvt_adapters |         pvt_adapters | ||||||
| ) | ) | ||||||
|  |  | ||||||
|  | if(OS_IS_MACOSX) | ||||||
|  |     if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")  # not AppleClang | ||||||
|  |         target_compile_definitions(core_receiver | ||||||
|  |             PUBLIC | ||||||
|  |                 -DBOOST_ASIO_HAS_STD_STRING_VIEW | ||||||
|  |         ) | ||||||
|  |     endif() | ||||||
|  | endif() | ||||||
|  |  | ||||||
| set_property(TARGET core_receiver APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES | set_property(TARGET core_receiver APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES | ||||||
|     $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/src/core/receiver> |     $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/src/core/receiver> | ||||||
|     $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/src/core/interfaces> |     $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/src/core/interfaces> | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 Carles Fernandez
					Carles Fernandez