mirror of
				https://github.com/f4exb/sdrangel.git
				synced 2025-10-30 20:40:20 -04:00 
			
		
		
		
	bump version to 4.8.0 and fix new plugins
new cmake for: - channeltx/localsource - samplesink/localoutput
This commit is contained in:
		
							parent
							
								
									c9a95297d1
								
							
						
					
					
						commit
						32d9a73e44
					
				| @ -14,8 +14,8 @@ include(ExternalProject) | ||||
| 
 | ||||
| # configure version | ||||
| set(sdrangel_VERSION_MAJOR "4") | ||||
| set(sdrangel_VERSION_MINOR "7") | ||||
| set(sdrangel_VERSION_PATCH "1") | ||||
| set(sdrangel_VERSION_MINOR "8") | ||||
| set(sdrangel_VERSION_PATCH "0") | ||||
| set(sdrangel_VERSION_SUFFIX "") | ||||
| 
 | ||||
| # SDRAngel cmake options | ||||
|  | ||||
| @ -1,11 +1,8 @@ | ||||
| project(localsource) | ||||
| 
 | ||||
| set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") | ||||
| 
 | ||||
| set(localsource_SOURCES | ||||
| 	localsource.cpp | ||||
| 	localsourcethread.cpp | ||||
| 	localsourcegui.cpp | ||||
| 	localsourceplugin.cpp | ||||
| 	localsourcesettings.cpp | ||||
| ) | ||||
| @ -13,40 +10,48 @@ set(localsource_SOURCES | ||||
| set(localsource_HEADERS | ||||
| 	localsource.h | ||||
| 	localsourcethread.h | ||||
| 	localsourcegui.h | ||||
| 	localsourceplugin.h | ||||
| 	localsourcesettings.h | ||||
| ) | ||||
| 
 | ||||
| set(localsource_FORMS | ||||
| 	localsourcegui.ui | ||||
| ) | ||||
| 
 | ||||
| add_definitions(${QT_DEFINITIONS}) | ||||
| add_definitions(-DQT_PLUGIN) | ||||
| add_definitions(-DQT_SHARED) | ||||
| 
 | ||||
| qt5_wrap_ui(localsource_FORMS_HEADERS ${localsource_FORMS}) | ||||
| 
 | ||||
| add_library(localsource SHARED | ||||
| 	${localsource_SOURCES} | ||||
| 	${localsource_HEADERS_MOC} | ||||
| 	${localsource_FORMS_HEADERS} | ||||
| ) | ||||
| 
 | ||||
| target_include_directories(localsource PUBLIC | ||||
|     . | ||||
|     ${CMAKE_CURRENT_BINARY_DIR} | ||||
| include_directories( | ||||
|     ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client | ||||
|     ${Boost_INCLUDE_DIRS} | ||||
| ) | ||||
| 
 | ||||
| target_link_libraries(localsource | ||||
|     ${QT_LIBRARIES} | ||||
| if(NOT SERVER_MODE) | ||||
|     set(localsource_SOURCES | ||||
|         ${localsource_SOURCES} | ||||
|         localsourcegui.cpp | ||||
| 
 | ||||
|         localsourcegui.ui | ||||
|     ) | ||||
|     set(localsource_HEADERS | ||||
|         ${localsource_HEADERS} | ||||
|         localsourcegui.h | ||||
|     ) | ||||
| 
 | ||||
|     set(TARGET_NAME localsource) | ||||
|     set(TARGET_LIB "Qt5::Widgets") | ||||
|     set(TARGET_LIB_GUI "sdrgui") | ||||
|     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR}) | ||||
| else() | ||||
|     set(TARGET_NAME localsourcesrv) | ||||
|     set(TARGET_LIB "") | ||||
|     set(TARGET_LIB_GUI "") | ||||
|     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR}) | ||||
| endif() | ||||
| 
 | ||||
| add_library(${TARGET_NAME} SHARED | ||||
| 	${localsource_SOURCES} | ||||
| ) | ||||
| 
 | ||||
| target_link_libraries(${TARGET_NAME} | ||||
|         Qt5::Core | ||||
|         ${TARGET_LIB} | ||||
| 	sdrbase | ||||
|     sdrgui | ||||
| 	${TARGET_LIB_GUI} | ||||
|         swagger | ||||
| ) | ||||
| 
 | ||||
| target_link_libraries(localsource Qt5::Core Qt5::Widgets Qt5::Network) | ||||
| 
 | ||||
| install(TARGETS localsource DESTINATION lib/plugins/channeltx) | ||||
| install(TARGETS ${TARGET_NAME} DESTINATION ${INSTALL_FOLDER}) | ||||
|  | ||||
| @ -1,50 +1,54 @@ | ||||
| project(localoutput) | ||||
| 
 | ||||
| set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") | ||||
| 
 | ||||
| set(localoutput_SOURCES | ||||
| 	localoutputgui.cpp | ||||
| 	localoutput.cpp | ||||
| 	localoutputplugin.cpp | ||||
| 	localoutputsettings.cpp | ||||
| ) | ||||
| 
 | ||||
| set(localoutput_HEADERS | ||||
| 	localoutputgui.h | ||||
| 	localoutput.h | ||||
| 	localoutputplugin.h | ||||
| 	localoutputsettings.h | ||||
| ) | ||||
| 
 | ||||
| set(localoutput_FORMS | ||||
| 	localoutputgui.ui | ||||
| ) | ||||
| 
 | ||||
| include_directories( | ||||
|     . | ||||
|     ${CMAKE_CURRENT_BINARY_DIR} | ||||
|         ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client | ||||
| ) | ||||
| 
 | ||||
| add_definitions(${QT_DEFINITIONS}) | ||||
| add_definitions(-DQT_PLUGIN) | ||||
| add_definitions(-DQT_SHARED) | ||||
| 
 | ||||
| qt5_wrap_ui(localoutput_FORMS_HEADERS ${localoutput_FORMS}) | ||||
| 
 | ||||
| add_library(outputlocal SHARED | ||||
| if(NOT SERVER_MODE) | ||||
|     set(localoutput_SOURCES | ||||
|         ${localoutput_SOURCES} | ||||
|         localoutputgui.cpp | ||||
| 
 | ||||
|         localoutputgui.ui | ||||
|     ) | ||||
|     set(localoutput_HEADERS | ||||
|         ${localoutput_HEADERS} | ||||
|         localoutputgui.h | ||||
|     ) | ||||
| 
 | ||||
|     set(TARGET_NAME outputlocal) | ||||
|     set(TARGET_LIB "Qt5::Widgets") | ||||
|     set(TARGET_LIB_GUI "sdrgui") | ||||
|     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR}) | ||||
| else() | ||||
|     set(TARGET_NAME outputlocalsrv) | ||||
|     set(TARGET_LIB "") | ||||
|     set(TARGET_LIB_GUI "") | ||||
|     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR}) | ||||
| endif() | ||||
| 
 | ||||
| add_library(${TARGET_NAME} SHARED | ||||
| 	${localoutput_SOURCES} | ||||
| 	${localoutput_HEADERS_MOC} | ||||
| 	${localoutput_FORMS_HEADERS} | ||||
| ) | ||||
| 
 | ||||
| target_link_libraries(outputlocal | ||||
|     ${QT_LIBRARIES} | ||||
| target_link_libraries(${TARGET_NAME} | ||||
|         Qt5::Core | ||||
|         ${TARGET_LIB} | ||||
| 	sdrbase | ||||
|     sdrgui | ||||
| 	${TARGET_LIB_GUI} | ||||
|         swagger | ||||
| ) | ||||
| 
 | ||||
| target_link_libraries(outputlocal Qt5::Core Qt5::Widgets) | ||||
| 
 | ||||
| install(TARGETS outputlocal DESTINATION lib/plugins/samplesink) | ||||
| install(TARGETS ${TARGET_NAME} DESTINATION ${INSTALL_FOLDER}) | ||||
|  | ||||
							
								
								
									
										50
									
								
								plugins/samplesink/localoutput/ccc.txt
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										50
									
								
								plugins/samplesink/localoutput/ccc.txt
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,50 @@ | ||||
| project(localoutput) | ||||
| 
 | ||||
| set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") | ||||
| 
 | ||||
| set(localoutput_SOURCES | ||||
| 	localoutputgui.cpp | ||||
| 	localoutput.cpp | ||||
| 	localoutputplugin.cpp | ||||
| 	localoutputsettings.cpp | ||||
| ) | ||||
| 
 | ||||
| set(localoutput_HEADERS | ||||
| 	localoutputgui.h | ||||
| 	localoutput.h | ||||
| 	localoutputplugin.h | ||||
| 	localoutputsettings.h | ||||
| ) | ||||
| 
 | ||||
| set(localoutput_FORMS | ||||
| 	localoutputgui.ui | ||||
| ) | ||||
| 
 | ||||
| include_directories( | ||||
|     . | ||||
|     ${CMAKE_CURRENT_BINARY_DIR} | ||||
|     ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client | ||||
| ) | ||||
| 
 | ||||
| add_definitions(${QT_DEFINITIONS}) | ||||
| add_definitions(-DQT_PLUGIN) | ||||
| add_definitions(-DQT_SHARED) | ||||
| 
 | ||||
| qt5_wrap_ui(localoutput_FORMS_HEADERS ${localoutput_FORMS}) | ||||
| 
 | ||||
| add_library(outputlocal SHARED | ||||
| 	${localoutput_SOURCES} | ||||
| 	${localoutput_HEADERS_MOC} | ||||
| 	${localoutput_FORMS_HEADERS} | ||||
| ) | ||||
| 
 | ||||
| target_link_libraries(outputlocal | ||||
|     ${QT_LIBRARIES} | ||||
|     sdrbase | ||||
|     sdrgui | ||||
|     swagger | ||||
| ) | ||||
| 
 | ||||
| target_link_libraries(outputlocal Qt5::Core Qt5::Widgets) | ||||
| 
 | ||||
| install(TARGETS outputlocal DESTINATION lib/plugins/samplesink) | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user