UnrealXR/nrealAirLinuxDriver
Archived
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move Fusion submodule

Browse source 
Signed-off-by: TheJackiMonster <thejackimonster@gmail.com>
This commit is contained in:
TheJackiMonster 2023-09-07 23:02:59 +02:00
parent 20a7a0a6e8
commit 5e9d4d036b
No known key found for this signature in database
GPG key ID: D850A5F772E880F9
4 changed files with 6 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.gitmodules vendored
View file

@ -1,3 +1,3 @@
[submodule "modules/Fusion"] [submodule "modules/Fusion"]
path = modules/Fusion path = interface_lib/modules/Fusion
url = https://github.com/TheJackiMonster/Fusion.git url = https://github.com/TheJackiMonster/Fusion.git

10
CMakeLists.txt
View file

@ -3,10 +3,6 @@ project(nrealAirLinuxDriver C)
set(CMAKE_C_STANDARD 17) 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(interface_lib)
add_subdirectory(examples) add_subdirectory(examples)
@ -14,14 +10,10 @@ add_executable(nrealAirLinuxDriver
src/driver.c src/driver.c
) )
target_include_directories(nrealAirLinuxDriver
SYSTEM BEFORE PRIVATE ${FUSION_INCLUDE_DIR}
)
target_include_directories(nrealAirLinuxDriver target_include_directories(nrealAirLinuxDriver
BEFORE PUBLIC ${NRA_INCLUDE_DIR} BEFORE PUBLIC ${NRA_INCLUDE_DIR}
) )
target_link_libraries(nrealAirLinuxDriver target_link_libraries(nrealAirLinuxDriver
${NRA_LIBRARY} ${FUSION_LIBRARY} ${NRA_LIBRARY}
) )

4
interface_lib/CMakeLists.txt
View file

@ -6,6 +6,10 @@ set(CMAKE_C_STANDARD 17)
find_package(hidapi REQUIRED) find_package(hidapi REQUIRED)
find_package(json-c 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( add_library(
nrealAirLibrary nrealAirLibrary
src/crc32.c src/crc32.c

0
modules/Fusion → interface_lib/modules/Fusion
View file