mirror of
https://github.com/rtlsdrblog/rtl-sdr-blog.git
synced 2024-11-06 10:47:35 +01:00
Fixed issues compiling on Windows with MSVC, CMake and NMake (#61)
When trying to build a simple program which uses librtlsdr as a subproject on Windows, CMake reported several problems which were solved by: - Added complete name of libusb in FindLibUSB module. - Replaced CMAKE_SOURCE_DIR to PROJECT_SOURCE_DIR in src/CMakeLists.txt. - Replaced header file <afxres.h> in src/rtlsdr.rc.in (only present when windows MFC is installed) by <windows.h> which defines the same constants.
This commit is contained in:
parent
bd73737c49
commit
b5af355b1d
@ -9,7 +9,7 @@ if(NOT LIBUSB_FOUND)
|
|||||||
)
|
)
|
||||||
|
|
||||||
#standard library name for libusb-1.0
|
#standard library name for libusb-1.0
|
||||||
set(libusb1_library_names usb-1.0)
|
set(libusb1_library_names usb-1.0 libusb-1.0)
|
||||||
|
|
||||||
#libusb-1.0 compatible library on freebsd
|
#libusb-1.0 compatible library on freebsd
|
||||||
if((CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") OR (CMAKE_SYSTEM_NAME STREQUAL "kFreeBSD"))
|
if((CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") OR (CMAKE_SYSTEM_NAME STREQUAL "kFreeBSD"))
|
||||||
|
@ -34,7 +34,7 @@ RTLSDR_APPEND_SRCS(
|
|||||||
# Set up Windows DLL resource files
|
# Set up Windows DLL resource files
|
||||||
########################################################################
|
########################################################################
|
||||||
IF(MSVC)
|
IF(MSVC)
|
||||||
include(${CMAKE_SOURCE_DIR}/cmake/Modules/Version.cmake)
|
include(${PROJECT_SOURCE_DIR}/cmake/Modules/Version.cmake)
|
||||||
|
|
||||||
configure_file(
|
configure_file(
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/rtlsdr.rc.in
|
${CMAKE_CURRENT_SOURCE_DIR}/rtlsdr.rc.in
|
||||||
@ -146,6 +146,7 @@ target_link_libraries(rtl_fm libgetopt_static)
|
|||||||
target_link_libraries(rtl_eeprom libgetopt_static)
|
target_link_libraries(rtl_eeprom libgetopt_static)
|
||||||
target_link_libraries(rtl_adsb libgetopt_static)
|
target_link_libraries(rtl_adsb libgetopt_static)
|
||||||
target_link_libraries(rtl_power libgetopt_static)
|
target_link_libraries(rtl_power libgetopt_static)
|
||||||
|
target_link_libraries(rtl_biast libgetopt_static)
|
||||||
set_property(TARGET rtl_sdr APPEND PROPERTY COMPILE_DEFINITIONS "rtlsdr_STATIC" )
|
set_property(TARGET rtl_sdr APPEND PROPERTY COMPILE_DEFINITIONS "rtlsdr_STATIC" )
|
||||||
set_property(TARGET rtl_tcp APPEND PROPERTY COMPILE_DEFINITIONS "rtlsdr_STATIC" )
|
set_property(TARGET rtl_tcp APPEND PROPERTY COMPILE_DEFINITIONS "rtlsdr_STATIC" )
|
||||||
set_property(TARGET rtl_test APPEND PROPERTY COMPILE_DEFINITIONS "rtlsdr_STATIC" )
|
set_property(TARGET rtl_test APPEND PROPERTY COMPILE_DEFINITIONS "rtlsdr_STATIC" )
|
||||||
@ -153,6 +154,7 @@ set_property(TARGET rtl_fm APPEND PROPERTY COMPILE_DEFINITIONS "rtlsdr_STATIC" )
|
|||||||
set_property(TARGET rtl_eeprom APPEND PROPERTY COMPILE_DEFINITIONS "rtlsdr_STATIC" )
|
set_property(TARGET rtl_eeprom APPEND PROPERTY COMPILE_DEFINITIONS "rtlsdr_STATIC" )
|
||||||
set_property(TARGET rtl_adsb APPEND PROPERTY COMPILE_DEFINITIONS "rtlsdr_STATIC" )
|
set_property(TARGET rtl_adsb APPEND PROPERTY COMPILE_DEFINITIONS "rtlsdr_STATIC" )
|
||||||
set_property(TARGET rtl_power APPEND PROPERTY COMPILE_DEFINITIONS "rtlsdr_STATIC" )
|
set_property(TARGET rtl_power APPEND PROPERTY COMPILE_DEFINITIONS "rtlsdr_STATIC" )
|
||||||
|
set_property(TARGET rtl_biast APPEND PROPERTY COMPILE_DEFINITIONS "rtlsdr_STATIC" )
|
||||||
endif()
|
endif()
|
||||||
########################################################################
|
########################################################################
|
||||||
# Install built library files & utilities
|
# Install built library files & utilities
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
|
|
||||||
#include <afxres.h>
|
#include <windows.h>
|
||||||
|
|
||||||
VS_VERSION_INFO VERSIONINFO
|
VS_VERSION_INFO VERSIONINFO
|
||||||
FILEVERSION 0,0,0,0
|
FILEVERSION 0,0,0,0
|
||||||
|
Loading…
Reference in New Issue
Block a user