diff --git a/.gitmodules b/.gitmodules index 5192490..56682d2 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "modules/Fusion"] - path = modules/Fusion + path = interface_lib/modules/Fusion url = https://github.com/TheJackiMonster/Fusion.git diff --git a/CMakeLists.txt b/CMakeLists.txt index c072cd7..c47dfa4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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} ) \ No newline at end of file diff --git a/interface_lib/CMakeLists.txt b/interface_lib/CMakeLists.txt index fec5dd4..c787c1f 100644 --- a/interface_lib/CMakeLists.txt +++ b/interface_lib/CMakeLists.txt @@ -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 diff --git a/modules/Fusion b/interface_lib/modules/Fusion similarity index 100% rename from modules/Fusion rename to interface_lib/modules/Fusion