mirror of
				https://github.com/f4exb/sdrangel.git
				synced 2025-10-30 12:30:20 -04:00 
			
		
		
		
	sdrbase cmake: restored Boost_INCLUDE_DIRS
This commit is contained in:
		
							parent
							
								
									f2bd3e4b84
								
							
						
					
					
						commit
						41f0fec4f6
					
				| @ -19,6 +19,7 @@ set(plutosdrdevice_HEADERS | |||||||
| include_directories( | include_directories( | ||||||
|     ${LIBIIO_INCLUDE_DIR} |     ${LIBIIO_INCLUDE_DIR} | ||||||
|     ${ICONV_INCLUDE_DIR} |     ${ICONV_INCLUDE_DIR} | ||||||
|  |     ${Boost_INCLUDE_DIRS} | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| add_library(plutosdrdevice SHARED | add_library(plutosdrdevice SHARED | ||||||
|  | |||||||
| @ -15,6 +15,7 @@ set(usrpdevice_HEADERS | |||||||
| 
 | 
 | ||||||
| include_directories( | include_directories( | ||||||
|     ${UHD_INCLUDE_DIR} |     ${UHD_INCLUDE_DIR} | ||||||
|  |     ${Boost_INCLUDE_DIRS} | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| add_library(usrpdevice SHARED | add_library(usrpdevice SHARED | ||||||
| @ -24,6 +25,10 @@ add_library(usrpdevice SHARED | |||||||
| set_target_properties(usrpdevice | set_target_properties(usrpdevice | ||||||
|     PROPERTIES DEFINE_SYMBOL "devices_EXPORTS") |     PROPERTIES DEFINE_SYMBOL "devices_EXPORTS") | ||||||
| 
 | 
 | ||||||
|  | if (NOT WIN32) | ||||||
|  |     link_directories(${Boost_LIBRARY_DIRS}) | ||||||
|  | endif() | ||||||
|  | 
 | ||||||
| target_link_libraries(usrpdevice | target_link_libraries(usrpdevice | ||||||
|     ${UHD_LIBRARIES} |     ${UHD_LIBRARIES} | ||||||
|     Boost::disable_autolinking |     Boost::disable_autolinking | ||||||
|  | |||||||
| @ -23,6 +23,7 @@ set(chanalyzer_HEADERS | |||||||
| 
 | 
 | ||||||
| include_directories( | include_directories( | ||||||
| 	${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client | 	${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client | ||||||
|  | 	${Boost_INCLUDE_DIRS} | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| add_library(chanalyzer SHARED | add_library(chanalyzer SHARED | ||||||
|  | |||||||
| @ -23,6 +23,7 @@ set(atv_HEADERS | |||||||
| 
 | 
 | ||||||
| include_directories( | include_directories( | ||||||
|     ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client |     ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client | ||||||
|  |     ${Boost_INCLUDE_DIRS} | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| add_library(demodatv SHARED | add_library(demodatv SHARED | ||||||
|  | |||||||
| @ -30,6 +30,7 @@ set(bfm_HEADERS | |||||||
| 
 | 
 | ||||||
| include_directories( | include_directories( | ||||||
|     ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client |     ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client | ||||||
|  |     ${Boost_INCLUDE_DIRS} | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| if(NOT SERVER_MODE) | if(NOT SERVER_MODE) | ||||||
|  | |||||||
| @ -22,6 +22,7 @@ set(filesink_HEADERS | |||||||
| 
 | 
 | ||||||
| include_directories( | include_directories( | ||||||
|     ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client |     ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client | ||||||
|  |     ${Boost_INCLUDE_DIRS} | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| if(NOT SERVER_MODE) | if(NOT SERVER_MODE) | ||||||
|  | |||||||
| @ -22,6 +22,7 @@ set(localsink_HEADERS | |||||||
| 
 | 
 | ||||||
| include_directories( | include_directories( | ||||||
|     ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client |     ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client | ||||||
|  |     ${Boost_INCLUDE_DIRS} | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| if(NOT SERVER_MODE) | if(NOT SERVER_MODE) | ||||||
|  | |||||||
| @ -35,6 +35,7 @@ include_directories( | |||||||
|     ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client |     ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client | ||||||
|     ${CM256CC_INCLUDE_DIR} |     ${CM256CC_INCLUDE_DIR} | ||||||
|     ${CUSTOM_WINDOWS_INCLUDE} |     ${CUSTOM_WINDOWS_INCLUDE} | ||||||
|  |     ${Boost_INCLUDE_DIRS} | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| if(NOT SERVER_MODE) | if(NOT SERVER_MODE) | ||||||
|  | |||||||
| @ -22,6 +22,7 @@ set(localsource_HEADERS | |||||||
| 
 | 
 | ||||||
| include_directories( | include_directories( | ||||||
|     ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client |     ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client | ||||||
|  |     ${Boost_INCLUDE_DIRS} | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| if(NOT SERVER_MODE) | if(NOT SERVER_MODE) | ||||||
|  | |||||||
| @ -21,6 +21,7 @@ set(mod_ieee_802_15_4_HEADERS | |||||||
| 
 | 
 | ||||||
| include_directories( | include_directories( | ||||||
|     ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client |     ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client | ||||||
|  |     ${Boost_INCLUDE_DIRS} | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| if(NOT SERVER_MODE) | if(NOT SERVER_MODE) | ||||||
|  | |||||||
| @ -33,6 +33,7 @@ include_directories( | |||||||
|     ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client |     ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client | ||||||
|     ${CM256CC_INCLUDE_DIR} |     ${CM256CC_INCLUDE_DIR} | ||||||
|     ${CUSTOM_WINDOWS_INCLUDE} |     ${CUSTOM_WINDOWS_INCLUDE} | ||||||
|  |     ${Boost_INCLUDE_DIRS} | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| if(NOT SERVER_MODE) | if(NOT SERVER_MODE) | ||||||
|  | |||||||
| @ -35,6 +35,7 @@ include_directories( | |||||||
|     ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client |     ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client | ||||||
| 	${CMAKE_SOURCE_DIR}/devices | 	${CMAKE_SOURCE_DIR}/devices | ||||||
|     ${CM256CC_INCLUDE_DIR} |     ${CM256CC_INCLUDE_DIR} | ||||||
|  |     ${Boost_INCLUDE_DIRS} | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| if(NOT SERVER_MODE) | if(NOT SERVER_MODE) | ||||||
|  | |||||||
| @ -20,6 +20,7 @@ include_directories( | |||||||
|     ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client |     ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client | ||||||
|     ${CMAKE_SOURCE_DIR}/devices |     ${CMAKE_SOURCE_DIR}/devices | ||||||
|     ${UHD_INCLUDE_DIR} |     ${UHD_INCLUDE_DIR} | ||||||
|  |     ${Boost_INCLUDE_DIRS} | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| if(NOT SERVER_MODE) | if(NOT SERVER_MODE) | ||||||
|  | |||||||
| @ -18,6 +18,7 @@ set(kiwisdr_HEADERS | |||||||
| 
 | 
 | ||||||
| include_directories( | include_directories( | ||||||
|     ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client |     ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client | ||||||
|  |     ${Boost_INCLUDE_DIRS} | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| if(NOT SERVER_MODE) | if(NOT SERVER_MODE) | ||||||
|  | |||||||
| @ -30,6 +30,7 @@ set(remoteinput_HEADERS | |||||||
| include_directories( | include_directories( | ||||||
|     ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client |     ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client | ||||||
|     ${CM256CC_INCLUDE_DIR} |     ${CM256CC_INCLUDE_DIR} | ||||||
|  |     ${Boost_INCLUDE_DIRS} | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| if(NOT SERVER_MODE) | if(NOT SERVER_MODE) | ||||||
|  | |||||||
| @ -20,6 +20,7 @@ include_directories( | |||||||
|     ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client |     ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client | ||||||
|     ${CMAKE_SOURCE_DIR}/devices |     ${CMAKE_SOURCE_DIR}/devices | ||||||
|     ${UHD_INCLUDE_DIR} |     ${UHD_INCLUDE_DIR} | ||||||
|  |     ${Boost_INCLUDE_DIRS} | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| if(NOT SERVER_MODE) | if(NOT SERVER_MODE) | ||||||
|  | |||||||
| @ -360,6 +360,7 @@ include_directories( | |||||||
|     ${CMAKE_SOURCE_DIR}/logging |     ${CMAKE_SOURCE_DIR}/logging | ||||||
|     ${CMAKE_SOURCE_DIR}/qrtplib |     ${CMAKE_SOURCE_DIR}/qrtplib | ||||||
|     ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client |     ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client | ||||||
|  |     ${Boost_INCLUDE_DIRS} | ||||||
|     ${OPUS_INCLUDE_DIRS} |     ${OPUS_INCLUDE_DIRS} | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| @ -380,7 +381,6 @@ target_link_libraries(sdrbase | |||||||
|     ${sdrbase_FFTW3F_LIB} |     ${sdrbase_FFTW3F_LIB} | ||||||
|     ${sdrbase_SERIALDV_LIB} |     ${sdrbase_SERIALDV_LIB} | ||||||
|     ${sdrbase_LIMERFE_LIB} |     ${sdrbase_LIMERFE_LIB} | ||||||
|     Boost::headers |  | ||||||
|     Qt5::Core |     Qt5::Core | ||||||
|     Qt5::Multimedia |     Qt5::Multimedia | ||||||
|     Qt5::WebSockets |     Qt5::WebSockets | ||||||
|  | |||||||
| @ -231,7 +231,8 @@ include_directories( | |||||||
|   ${CMAKE_SOURCE_DIR}/httpserver |   ${CMAKE_SOURCE_DIR}/httpserver | ||||||
|   ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client |   ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client | ||||||
|   ${OPENGL_INCLUDE_DIR} |   ${OPENGL_INCLUDE_DIR} | ||||||
|   ) |   ${Boost_INCLUDE_DIRS} | ||||||
|  | ) | ||||||
| 
 | 
 | ||||||
| add_library(sdrgui SHARED | add_library(sdrgui SHARED | ||||||
|   ${sdrgui_SOURCES} |   ${sdrgui_SOURCES} | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user