Move Fusion submodule
Signed-off-by: TheJackiMonster <thejackimonster@gmail.com>
This commit is contained in:
parent
20a7a0a6e8
commit
5e9d4d036b
4 changed files with 6 additions and 10 deletions
2
.gitmodules
vendored
2
.gitmodules
vendored
|
@ -1,3 +1,3 @@
|
|||
[submodule "modules/Fusion"]
|
||||
path = modules/Fusion
|
||||
path = interface_lib/modules/Fusion
|
||||
url = https://github.com/TheJackiMonster/Fusion.git
|
||||
|
|
|
@ -3,10 +3,6 @@ project(nrealAirLinuxDriver C)
|
|||
|
||||
set(CMAKE_C_STANDARD 17)
|
||||
|
||||
add_subdirectory(modules/Fusion/Fusion)
|
||||
set(FUSION_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/modules/Fusion)
|
||||
set(FUSION_LIBRARY Fusion)
|
||||
|
||||
add_subdirectory(interface_lib)
|
||||
add_subdirectory(examples)
|
||||
|
||||
|
@ -14,14 +10,10 @@ add_executable(nrealAirLinuxDriver
|
|||
src/driver.c
|
||||
)
|
||||
|
||||
target_include_directories(nrealAirLinuxDriver
|
||||
SYSTEM BEFORE PRIVATE ${FUSION_INCLUDE_DIR}
|
||||
)
|
||||
|
||||
target_include_directories(nrealAirLinuxDriver
|
||||
BEFORE PUBLIC ${NRA_INCLUDE_DIR}
|
||||
)
|
||||
|
||||
target_link_libraries(nrealAirLinuxDriver
|
||||
${NRA_LIBRARY} ${FUSION_LIBRARY}
|
||||
${NRA_LIBRARY}
|
||||
)
|
|
@ -6,6 +6,10 @@ set(CMAKE_C_STANDARD 17)
|
|||
find_package(hidapi REQUIRED)
|
||||
find_package(json-c REQUIRED)
|
||||
|
||||
add_subdirectory(modules/Fusion/Fusion)
|
||||
set(FUSION_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/modules/Fusion)
|
||||
set(FUSION_LIBRARY Fusion)
|
||||
|
||||
add_library(
|
||||
nrealAirLibrary
|
||||
src/crc32.c
|
||||
|
|
Reference in a new issue