fixed import error

intrepidcs · Nov 8, 2024 · 06de7b2 · 06de7b2
1 parent 4c36781
commit 06de7b2
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -3,6 +3,7 @@ cmake_minimum_required (VERSION 3.25)
 project (libneoradio2_all LANGUAGES C CXX)
 
 option(BUILD_PYTHON_BINDINGS "Enable Python bindings" OFF)
+option(BUILD_SHARED_LIBS "Build shared libraries" OFF)
 
 add_subdirectory(libneoradio2)
 

diff --git a/libneoradio2/CMakeLists.txt b/libneoradio2/CMakeLists.txt
@@ -3,6 +3,8 @@ project(libneoradio2 VERSION 1.3.1 LANGUAGES C CXX)
 
 add_definitions(-DLIBNEORADIO2_EXPORTS)
 
+option(BUILD_SHARED_LIBS "Build shared libraries" OFF)
+
 set(CMAKE_CXX_STANDARD 14)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
@@ -19,10 +21,9 @@ set(SourceFiles
     ${CMAKE_CURRENT_SOURCE_DIR}/src/libneoradio2.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/src/neoradio2device.cpp)
 
-add_library(${PROJECT_NAME} STATIC ${SourceFiles})
+add_library(${PROJECT_NAME} ${SourceFiles})
 target_include_directories(${PROJECT_NAME} PUBLIC ${IncludeDirectories})
 
 
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/hidapi)
 target_link_libraries(${PROJECT_NAME} hidapi)
-
diff --git a/libneoradio2/hidapi b/libneoradio2/hidapi
+70 −30		.github/workflows/builds.yml
+9 −7		.github/workflows/checks.yml
+2 −2		.github/workflows/docs.yaml
+1 −1		AUTHORS.txt
+3 −1		BUILD.autotools.md
+3 −3		BUILD.cmake.md
+4 −1		CMakeLists.txt
+1 −1		README.md
+1 −1		VERSION
+1 −1		configure.ac
+1 −1		dist/hidapi.podspec
+38 −4		hidapi/hidapi.h
+1 −1		hidtest/CMakeLists.txt
+26 −1		hidtest/test.c
+2 −2		libusb/CMakeLists.txt
+295 −147		libusb/hid.c
+174 −0		libusb/hidapi_thread_pthread.h
+1 −1		linux/CMakeLists.txt
+116 −38		linux/hid.c
+2 −2		mac/CMakeLists.txt
+1 −1		mac/Makefile-manual
+22 −16		mac/hid.c
+35 −0		netbsd/CMakeLists.txt
+29 −0		netbsd/README.md
+1,178 −0		netbsd/hid.c
+11 −0		pc/hidapi-netbsd.pc.in
+15 −2		src/CMakeLists.txt
+1 −1		subprojects/hidapi_build_cmake/CMakeLists.txt
+1 −1		udev/69-hid.rules
+161 −35		windows/hid.c
+55 −11		windows/hidapi_descriptor_reconstruct.c
+11 −2		windows/hidapi_descriptor_reconstruct.h
+1 −2		windows/hidapi_hidsdi.h
+21 −1		windows/hidapi_winapi.h
+65 −65		windows/pp_data_dump/pp_data_dump.c
+1 −0		windows/test/CMakeLists.txt
+1 −1		windows/test/data/045E_02FF_0005_0001_expected.rpt_desc
+302 −0		windows/test/data/1532_00A3_0002_0001.pp_data
+9 −0		windows/test/data/1532_00A3_0002_0001_expected.rpt_desc
+53 −0		windows/test/data/1532_00A3_0002_0001_real.rpt_desc
+77 −75		windows/test/hid_report_reconstructor_test.c