npm: add firmata & imraa support to npm
mraa_LIB_PLAT_SRCS_NOAUTO no longer used for firmata unlike USBPLAT but mraa_LIB_SRCS_NOAUTO and this is now loaded before the standard src files for mraa. The package still needs to be generated with IMRAA & FIRMATA enabled for this to work. Signed-off-by: Brendan Le Foll <brendan.le.foll@intel.com>
This commit is contained in:
@@ -4,6 +4,11 @@ set (mraa_LIB_INCLUDE_DIRS
|
||||
${PROJECT_SOURCE_DIR}/include
|
||||
)
|
||||
|
||||
if (FIRMATA)
|
||||
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DFIRMATA=1")
|
||||
add_subdirectory (firmata)
|
||||
endif ()
|
||||
|
||||
include_directories(
|
||||
${mraa_LIB_INCLUDE_DIRS}
|
||||
)
|
||||
@@ -17,6 +22,7 @@ set (mraa_LIB_SRCS_NOAUTO
|
||||
${PROJECT_SOURCE_DIR}/src/aio/aio.c
|
||||
${PROJECT_SOURCE_DIR}/src/uart/uart.c
|
||||
${PROJECT_SOURCE_DIR}/src/iio/iio.c
|
||||
${mraa_LIB_SRCS_NOAUTO}
|
||||
)
|
||||
|
||||
set (mraa_LIB_X86_SRCS_NOAUTO
|
||||
@@ -106,11 +112,6 @@ if (USBPLAT)
|
||||
add_subdirectory(usb)
|
||||
endif ()
|
||||
|
||||
if (FIRMATA)
|
||||
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DFIRMATA=1")
|
||||
add_subdirectory (firmata)
|
||||
endif ()
|
||||
|
||||
if (IMRAA)
|
||||
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DIMRAA=1")
|
||||
find_package (JSON-C REQUIRED)
|
||||
|
||||
Reference in New Issue
Block a user