VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-12-23 01:55:48 -05:00
Code Issues Projects Releases Wiki Activity

Build: Windows: fixed RTL-SDR support

Browse Source
This commit is contained in:
f4exb 2019-06-29 04:02:19 +02:00
parent 871ec7eb2c
commit 563a4d589f
4 changed files with 48 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG
View File

@ -1,3 +1,9 @@
sdrangel (4.10.3-1) unstable; urgency=medium
* Windows build: fixed RTL-SDR support
-- Edouard Griffiths, F4EXB <f4exb06@gmail.com> Fri, 28 Jun 2019 20:44:06 +0200
sdrangel (4.10.2-1) unstable; urgency=medium sdrangel (4.10.2-1) unstable; urgency=medium
* Windows MSVC with cmake build introduction * Windows MSVC with cmake build introduction

2
CMakeLists.txt
View File

@ -18,7 +18,7 @@ set(CMAKE_CXX_EXTENSIONS OFF)
# configure version # configure version
set(sdrangel_VERSION_MAJOR "4") set(sdrangel_VERSION_MAJOR "4")
set(sdrangel_VERSION_MINOR "10") set(sdrangel_VERSION_MINOR "10")
set(sdrangel_VERSION_PATCH "2") set(sdrangel_VERSION_PATCH "3")
set(sdrangel_VERSION_SUFFIX "") set(sdrangel_VERSION_SUFFIX "")
# SDRAngel cmake options # SDRAngel cmake options

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
sdrangel (4.10.3-1) unstable; urgency=medium
* Windows build: fixed RTL-SDR support
-- Edouard Griffiths, F4EXB <f4exb06@gmail.com> Fri, 28 Jun 2019 20:44:06 +0200
sdrangel (4.10.2-1) unstable; urgency=medium sdrangel (4.10.2-1) unstable; urgency=medium
* Windows MSVC with cmake build introduction * Windows MSVC with cmake build introduction

35
external/CMakeLists.txt vendored
View File

@ -372,6 +372,41 @@ if (LINUX)
endif(LINUX) endif(LINUX)
if(WIN32 OR APPLE) if(WIN32 OR APPLE)
if(ENABLE_RTLSDR)
if(WIN32)
set(RTLSDR_LIBUSB_INCLUDE "${LIBUSB_INCLUDE_DIR}/libusb-1.0")
else()
set(RTLSDR_LIBUSB_INCLUDE "${LIBUSB_INCLUDE_DIR}")
endif()
# needs pkgconfig and libusb
ExternalProject_Add(rtlsdr
GIT_REPOSITORY https://github.com/osmocom/rtl-sdr.git
GIT_TAG ${RTLSDR_TAG}
DEPENDS ${PTHREADS4W_DEPENDS}
PREFIX "${EXTERNAL_BUILD_LIBRARIES}/rtlsdr"
CMAKE_ARGS ${DEFAULT_OUTPUT_DIRECTORIES}
-DINSTALL_UDEV_RULES=${RTLSDR_UDEV}
-DLIBUSB_LIBRARIES=${LIBUSB_LIBRARIES}
-DLIBUSB_INCLUDE_DIR=${RTLSDR_LIBUSB_INCLUDE}
-DTHREADS_PTHREADS_INCLUDE_DIR=${PTHREADS4W_INCLUDE_DIR}
-DTHREADS_PTHREADS_WIN32_LIBRARY=${PTHREADS4W_LIBRARIES}
INSTALL_COMMAND ""
TEST_COMMAND ""
)
ExternalProject_Get_Property(rtlsdr source_dir binary_dir)
set(LIBRTLSDR_FOUND ON CACHE INTERNAL "")
set(LIBRTLSDR_INCLUDE_DIR "${source_dir}/include" CACHE INTERNAL "")
if(WIN32)
set(LIBRTLSDR_LIBRARIES "${SDRANGEL_BINARY_LIB_DIR}/rtlsdr.lib" CACHE INTERNAL "")
install(FILES "${SDRANGEL_BINARY_BIN_DIR}/rtlsdr${CMAKE_SHARED_LIBRARY_SUFFIX}" DESTINATION "${INSTALL_LIB_DIR}")
elseif(APPLE)
set(LIBRTLSDR_LIBRARIES "${binary_dir}/src/librtlsdr${CMAKE_SHARED_LIBRARY_SUFFIX}" CACHE INTERNAL "")
install(DIRECTORY "${binary_dir}/src/" DESTINATION "${INSTALL_LIB_DIR}"
FILES_MATCHING PATTERN "librtlsdr*${CMAKE_SHARED_LIBRARY_SUFFIX}")
set(MACOS_EXTERNAL_LIBS_FIXUP "${MACOS_EXTERNAL_LIBS_FIXUP};${binary_dir}/src/")
endif()
endif(ENABLE_RTLSDR)
if(ENABLE_LIMESUITE) if(ENABLE_LIMESUITE)
# needs pkgconfig, libusb # needs pkgconfig, libusb
ExternalProject_Add(limesuite ExternalProject_Add(limesuite