From 567476b89a6ea618e4879c8ae086470846b9cb02 Mon Sep 17 00:00:00 2001 From: Noel Eck Date: Mon, 6 Feb 2017 16:15:58 -0800 Subject: [PATCH] cmake: Explicit dependency for mraa and interfaces A handful of modules do not require mraa. Captured this in src/CMakeLists.txt - only add mraa dependency for targets which use: upm_module_init(mraa ... ) or upm_mixed_module_init(... REQUIRES mraa) All sensors which use UPM interfaces (src/interfaces) now explicitly add the interfaces target: upm_module_init(interfaces ... ) or upm_mixed_module_init(... REQUIRES interfaces) Signed-off-by: Noel Eck --- CMakeLists.txt | 4 ++++ src/CMakeLists.txt | 24 +++++++++++++----------- src/adafruitss/CMakeLists.txt | 2 +- src/adc121c021/CMakeLists.txt | 2 +- src/adis16448/CMakeLists.txt | 2 +- src/ads1x15/CMakeLists.txt | 2 +- src/adxl335/CMakeLists.txt | 2 +- src/adxl345/CMakeLists.txt | 2 +- src/adxrs610/CMakeLists.txt | 2 +- src/am2315/CMakeLists.txt | 2 +- src/apds9002/CMakeLists.txt | 2 +- src/apds9930/CMakeLists.txt | 2 +- src/at42qt1070/CMakeLists.txt | 2 +- src/bma220/CMakeLists.txt | 2 +- src/bmp280/CMakeLists.txt | 2 +- src/bmpx8x/CMakeLists.txt | 2 +- src/bmx055/CMakeLists.txt | 2 +- src/bno055/CMakeLists.txt | 2 +- src/curieimu/CMakeLists.txt | 2 +- src/cwlsxxa/CMakeLists.txt | 2 +- src/ds1307/CMakeLists.txt | 2 +- src/ds1808lc/CMakeLists.txt | 2 +- src/ds2413/CMakeLists.txt | 2 +- src/ecs1030/CMakeLists.txt | 2 +- src/grove/CMakeLists.txt | 2 +- src/grovecollision/CMakeLists.txt | 2 +- src/groveehr/CMakeLists.txt | 2 +- src/groveeldriver/CMakeLists.txt | 2 +- src/groveelectromagnet/CMakeLists.txt | 2 +- src/groveemg/CMakeLists.txt | 2 +- src/grovegprs/CMakeLists.txt | 2 +- src/grovegsr/CMakeLists.txt | 2 +- src/grovelinefinder/CMakeLists.txt | 2 +- src/grovemd/CMakeLists.txt | 2 +- src/grovemoisture/CMakeLists.txt | 2 +- src/groveo2/CMakeLists.txt | 2 +- src/grovescam/CMakeLists.txt | 2 +- src/grovespeaker/CMakeLists.txt | 2 +- src/groveultrasonic/CMakeLists.txt | 2 +- src/grovevdiv/CMakeLists.txt | 2 +- src/grovewater/CMakeLists.txt | 2 +- src/grovewfs/CMakeLists.txt | 2 +- src/h3lis331dl/CMakeLists.txt | 2 +- src/hcsr04/CMakeLists.txt | 2 +- src/hdxxvxta/CMakeLists.txt | 2 +- src/hlg150h/CMakeLists.txt | 2 +- src/hm11/CMakeLists.txt | 2 +- src/hmtrp/CMakeLists.txt | 2 +- src/hp20x/CMakeLists.txt | 2 +- src/ht9170/CMakeLists.txt | 2 +- src/htu21d/CMakeLists.txt | 2 +- src/hx711/CMakeLists.txt | 2 +- src/ili9341/CMakeLists.txt | 2 +- src/ina132/CMakeLists.txt | 2 +- src/interfaces/CMakeLists.txt | 3 +++ src/isd1820/CMakeLists.txt | 2 +- src/itg3200/CMakeLists.txt | 2 +- src/kxcjk1013/CMakeLists.txt | 2 +- src/l298/CMakeLists.txt | 2 +- src/l3gd20/CMakeLists.txt | 2 +- src/lcd/CMakeLists.txt | 2 +- src/lol/CMakeLists.txt | 2 +- src/lp8860/CMakeLists.txt | 2 +- src/lpd8806/CMakeLists.txt | 2 +- src/lsm303/CMakeLists.txt | 2 +- src/lsm9ds0/CMakeLists.txt | 2 +- src/max31723/CMakeLists.txt | 2 +- src/max31855/CMakeLists.txt | 2 +- src/max44000/CMakeLists.txt | 2 +- src/max44009/CMakeLists.txt | 2 +- src/max5487/CMakeLists.txt | 2 +- src/maxds3231m/CMakeLists.txt | 2 +- src/maxsonarez/CMakeLists.txt | 2 +- src/mcp9808/CMakeLists.txt | 2 +- src/mg811/CMakeLists.txt | 2 +- src/mhz16/CMakeLists.txt | 2 +- src/micsv89/CMakeLists.txt | 2 +- src/mlx90614/CMakeLists.txt | 2 +- src/mma7455/CMakeLists.txt | 2 +- src/mpl3115a2/CMakeLists.txt | 2 +- src/mpu9150/CMakeLists.txt | 2 +- src/ms5611/CMakeLists.txt | 2 +- src/nlgpio16/CMakeLists.txt | 2 +- src/nrf24l01/CMakeLists.txt | 2 +- src/nrf8001/CMakeLists.txt | 2 +- src/pca9685/CMakeLists.txt | 2 +- src/pn532/CMakeLists.txt | 2 +- src/pulsensor/CMakeLists.txt | 2 +- src/rf22/CMakeLists.txt | 2 +- src/rfr359f/CMakeLists.txt | 2 +- src/rgbringcoder/CMakeLists.txt | 2 +- src/rhusb/CMakeLists.txt | 2 +- src/si1132/CMakeLists.txt | 2 +- src/si114x/CMakeLists.txt | 2 +- src/si7005/CMakeLists.txt | 2 +- src/sm130/CMakeLists.txt | 2 +- src/smartdrive/CMakeLists.txt | 2 +- src/ssd1351/CMakeLists.txt | 2 +- src/st7735/CMakeLists.txt | 2 +- src/stepmotor/CMakeLists.txt | 2 +- src/sx1276/CMakeLists.txt | 2 +- src/sx6119/CMakeLists.txt | 2 +- src/t6713/CMakeLists.txt | 2 +- src/ta12200/CMakeLists.txt | 2 +- src/tcs3414cs/CMakeLists.txt | 2 +- src/teams/CMakeLists.txt | 2 +- src/tex00/CMakeLists.txt | 2 +- src/th02/CMakeLists.txt | 2 +- src/tm1637/CMakeLists.txt | 2 +- src/ultrasonic/CMakeLists.txt | 2 +- src/waterlevel/CMakeLists.txt | 2 +- src/wheelencoder/CMakeLists.txt | 2 +- src/wt5001/CMakeLists.txt | 2 +- src/xbee/CMakeLists.txt | 2 +- src/zfm20/CMakeLists.txt | 2 +- 115 files changed, 132 insertions(+), 123 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6cbf3248..acbdd0f8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -120,6 +120,8 @@ find_package (PkgConfig REQUIRED) unset(MRAA_FOUND CACHE) set(MRAA_MINIMUM 1.4.0) pkg_check_modules (MRAA REQUIRED mraa>=${MRAA_MINIMUM}) +# Also, get full path to the mraa library +find_library(MRAA_LIBRARY NAMES mraa PATHS ${MRAA_LIBDIR} NO_DEFAULT_PATH) # Check for BACNET pkg_check_modules (BACNET libbacnet) @@ -143,6 +145,8 @@ if (BUILDSWIGJAVA) find_package (Java REQUIRED) find_package (JNI REQUIRED) pkg_check_modules (MRAAJAVA REQUIRED mraajava>=0.8.0) + # Also, get full path to the mraajava library + find_library(MRAAJAVA_LIBRARY NAMES mraajava PATHS ${MRAA_LIBDIR} NO_DEFAULT_PATH) endif (BUILDSWIGJAVA) # Find swig if any wrapper is enabled diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 10568f16..38ac427d 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -140,7 +140,7 @@ macro(_upm_swig_python) # Get target library name (example _pyupm_a110x-python2) set (python_wrapper_target ${SWIG_MODULE_${python_wrapper_name}_REAL_NAME}) - swig_link_libraries (${python_wrapper_name} ${PYTHON_LIBRARIES} ${MRAA_LIBRARIES} ${libname}) + swig_link_libraries (${python_wrapper_name} ${PYTHON_LIBRARIES} ${libname}) target_include_directories (${python_wrapper_target} PUBLIC "${PYTHON_INCLUDE_PATH}" @@ -237,7 +237,7 @@ macro(upm_swig_node) set_property (SOURCE jsupm_${libname}.i PROPERTY SWIG_FLAGS "-node" "-DV8_VERSION=${V8_VERSION_HEX}") set_source_files_properties (jsupm_${libname}.i PROPERTIES CPLUSPLUS ON) swig_add_module (jsupm_${libname} javascript jsupm_${libname}.i) - swig_link_libraries (jsupm_${libname} ${MRAA_LIBRARIES} ${NODE_LIBRARIES} ${libname}) + swig_link_libraries (jsupm_${libname} ${NODE_LIBRARIES} ${libname}) target_include_directories ( ${SWIG_MODULE_jsupm_${libname}_REAL_NAME} PUBLIC "${NODE_INCLUDE_DIRS}" @@ -302,7 +302,7 @@ macro(upm_swig_java) # See issue #518 # TODO: Fix this somehow swig_add_module (javaupm_${libname} java javaupm_${libname}.i ${module_src}) - swig_link_libraries (javaupm_${libname} ${MRAAJAVA_LIBRARIES} ${MRAA_LIBRARIES} ${JAVA_LIBRARIES} ${libname} interfaces) + swig_link_libraries (javaupm_${libname} ${MRAAJAVA_LIBRARY} ${JAVA_LIBRARIES} ${libname} interfaces) target_include_directories ( ${SWIG_MODULE_javaupm_${libname}_REAL_NAME} PUBLIC "${JAVA_INCLUDE_DIRS}" @@ -560,17 +560,19 @@ function(upm_module_init) # Iterate over all arguments passed to upm_module_init. # 1. Add them via target_link_libraries - # 2. If the argument is a target, + # 2. If mraa, then add a link and include dependency foreach (linkflag ${ARGN}) - target_link_libraries (${libname} ${linkflag}) + # Add necessary MRAA components IF the target requires it + if (${linkflag} MATCHES mraa) + target_link_libraries (${libname} ${MRAA_LIBRARY}) + # Always add a PUBLIC dependency to MRAA include dirs + target_include_directories (${libname} PUBLIC ${MRAA_INCLUDE_DIRS}) + else () + # Else, add the linkflag directly + target_link_libraries (${libname} ${linkflag}) + endif (${linkflag} MATCHES mraa) endforeach () - # Always add a dependency to MRAA libs - target_link_libraries (${libname} ${MRAA_LDFLAGS}) - - # Always add a dependency to MRAA include dirs - target_include_directories (${libname} PUBLIC ${MRAA_INCLUDE_DIRS}) - set_target_properties( ${libname} PROPERTIES PREFIX lib${libprefix} diff --git a/src/adafruitss/CMakeLists.txt b/src/adafruitss/CMakeLists.txt index 8cd8529e..7e44544c 100644 --- a/src/adafruitss/CMakeLists.txt +++ b/src/adafruitss/CMakeLists.txt @@ -2,4 +2,4 @@ set (libname "adafruitss") set (libdescription "Adafruit pca9685 based 16-channel servo shield") set (module_src ${libname}.cxx) set (module_hpp ${libname}.hpp) -upm_module_init() +upm_module_init(mraa) diff --git a/src/adc121c021/CMakeLists.txt b/src/adc121c021/CMakeLists.txt index bd40185a..d95f1953 100644 --- a/src/adc121c021/CMakeLists.txt +++ b/src/adc121c021/CMakeLists.txt @@ -2,4 +2,4 @@ set (libname "adc121c021") set (libdescription "Adc121c021 I2C ADC converter module") set (module_src ${libname}.cxx) set (module_hpp ${libname}.hpp) -upm_module_init() +upm_module_init(mraa) diff --git a/src/adis16448/CMakeLists.txt b/src/adis16448/CMakeLists.txt index b1b062a2..a818f569 100644 --- a/src/adis16448/CMakeLists.txt +++ b/src/adis16448/CMakeLists.txt @@ -2,4 +2,4 @@ set (libname "adis16448") set (libdescription "High-Precision IMU") set (module_src ${libname}.cxx) set (module_hpp ${libname}.hpp) -upm_module_init() +upm_module_init(mraa) diff --git a/src/ads1x15/CMakeLists.txt b/src/ads1x15/CMakeLists.txt index 53bfa912..d42f851b 100644 --- a/src/ads1x15/CMakeLists.txt +++ b/src/ads1x15/CMakeLists.txt @@ -2,7 +2,7 @@ set (libname "ads1x15") set (libdescription "Analog to digital converter") set (module_src ${libname}.cxx ads1115.cxx ads1015.cxx) set (module_hpp ${libname}.hpp ads1115.hpp ads1015.hpp) -upm_module_init(interfaces) +upm_module_init(interfaces mraa) compiler_flag_supported(CXX is_supported -Wno-overloaded-virtual) if (is_supported) target_compile_options(${libname} PUBLIC -Wno-overloaded-virtual) diff --git a/src/adxl335/CMakeLists.txt b/src/adxl335/CMakeLists.txt index a695dc7c..71101616 100644 --- a/src/adxl335/CMakeLists.txt +++ b/src/adxl335/CMakeLists.txt @@ -2,4 +2,4 @@ set (libname "adxl335") set (libdescription "Adxl335 grove 3-axis anaolog accelerometer") set (module_src ${libname}.cxx) set (module_hpp ${libname}.hpp) -upm_module_init() +upm_module_init(mraa) diff --git a/src/adxl345/CMakeLists.txt b/src/adxl345/CMakeLists.txt index cfba40af..452b72c7 100644 --- a/src/adxl345/CMakeLists.txt +++ b/src/adxl345/CMakeLists.txt @@ -2,4 +2,4 @@ set (libname "adxl345") set (libdescription "Digital Accelerometer") set (module_src ${libname}.cxx) set (module_hpp ${libname}.hpp) -upm_module_init() +upm_module_init(mraa) diff --git a/src/adxrs610/CMakeLists.txt b/src/adxrs610/CMakeLists.txt index 63143512..6cfc8f5f 100644 --- a/src/adxrs610/CMakeLists.txt +++ b/src/adxrs610/CMakeLists.txt @@ -2,4 +2,4 @@ set (libname "adxrs610") set (libdescription "ADXRS610 gyroscope") set (module_src ${libname}.cxx) set (module_hpp ${libname}.hpp) -upm_module_init() +upm_module_init(mraa) diff --git a/src/am2315/CMakeLists.txt b/src/am2315/CMakeLists.txt index 205ec760..c5deaa7e 100644 --- a/src/am2315/CMakeLists.txt +++ b/src/am2315/CMakeLists.txt @@ -2,4 +2,4 @@ set (libname "am2315") set (libdescription "Humidity Sensor") set (module_src ${libname}.cpp) set (module_hpp ${libname}.hpp) -upm_module_init() +upm_module_init(mraa) diff --git a/src/apds9002/CMakeLists.txt b/src/apds9002/CMakeLists.txt index d3d04ede..50484b0e 100644 --- a/src/apds9002/CMakeLists.txt +++ b/src/apds9002/CMakeLists.txt @@ -2,4 +2,4 @@ set (libname "apds9002") set (libdescription "Apds9002 luminance module") set (module_src ${libname}.cxx) set (module_hpp ${libname}.hpp) -upm_module_init() +upm_module_init(mraa) diff --git a/src/apds9930/CMakeLists.txt b/src/apds9930/CMakeLists.txt index 6775ab45..c9cb0063 100755 --- a/src/apds9930/CMakeLists.txt +++ b/src/apds9930/CMakeLists.txt @@ -2,4 +2,4 @@ set (libname "apds9930") set (libdescription "Apds9930 sensor module") set (module_src ${libname}.cxx) set (module_hpp ${libname}.hpp) -upm_module_init() +upm_module_init(mraa) diff --git a/src/at42qt1070/CMakeLists.txt b/src/at42qt1070/CMakeLists.txt index 9d539ec9..aedd3702 100644 --- a/src/at42qt1070/CMakeLists.txt +++ b/src/at42qt1070/CMakeLists.txt @@ -2,4 +2,4 @@ set (libname "at42qt1070") set (libdescription "Module for the Atmel AT42QT1070 QTouch sensor") set (module_src ${libname}.cxx) set (module_hpp ${libname}.hpp) -upm_module_init() +upm_module_init(mraa) diff --git a/src/bma220/CMakeLists.txt b/src/bma220/CMakeLists.txt index 0058f0b6..fcdc00b9 100644 --- a/src/bma220/CMakeLists.txt +++ b/src/bma220/CMakeLists.txt @@ -2,4 +2,4 @@ set (libname "bma220") set (libdescription "Accelerometer sensor based on bma220") set (module_src ${libname}.cxx) set (module_hpp ${libname}.hpp) -upm_module_init() +upm_module_init(mraa) diff --git a/src/bmp280/CMakeLists.txt b/src/bmp280/CMakeLists.txt index 6b5ac7e6..7fb9e7cd 100644 --- a/src/bmp280/CMakeLists.txt +++ b/src/bmp280/CMakeLists.txt @@ -2,4 +2,4 @@ set (libname "bmp280") set (libdescription "Bosch bmp280 Pressure sensor and bme280 humidity sensor") set (module_src ${libname}.cxx bme280.cxx) set (module_hpp ${libname}.hpp bme280.hpp) -upm_module_init(interfaces) +upm_module_init(interfaces mraa) diff --git a/src/bmpx8x/CMakeLists.txt b/src/bmpx8x/CMakeLists.txt index dff20a22..4e5474b3 100644 --- a/src/bmpx8x/CMakeLists.txt +++ b/src/bmpx8x/CMakeLists.txt @@ -2,4 +2,4 @@ set (libname "bmpx8x") set (libdescription "Bosch BMP & GY65 atmospheric pressure sensor library") set (module_src ${libname}.cxx) set (module_hpp ${libname}.hpp) -upm_module_init() +upm_module_init(mraa interfaces) diff --git a/src/bmx055/CMakeLists.txt b/src/bmx055/CMakeLists.txt index 5e968a5a..bd5b7fad 100644 --- a/src/bmx055/CMakeLists.txt +++ b/src/bmx055/CMakeLists.txt @@ -2,4 +2,4 @@ set (libname "bmx055") set (libdescription "Bosch bmx055, bmi055, bma250e, bmc150, bmg160, bmm150") set (module_src ${libname}.cxx bma250e.cxx bmg160.cxx bmm150.cxx bmc150.cxx bmi055.cxx) set (module_hpp ${libname}.hpp bma250e.hpp bmg160.hpp bmm150.hpp bmc150.cxx bmi055.hpp) -upm_module_init() +upm_module_init(mraa) diff --git a/src/bno055/CMakeLists.txt b/src/bno055/CMakeLists.txt index b62eac98..80368fc2 100644 --- a/src/bno055/CMakeLists.txt +++ b/src/bno055/CMakeLists.txt @@ -2,4 +2,4 @@ set (libname "bno055") set (libdescription "Bosch bno055 intelligent orientation sensor 9dof fusion") set (module_src ${libname}.cxx) set (module_hpp ${libname}.hpp) -upm_module_init() +upm_module_init(mraa) diff --git a/src/curieimu/CMakeLists.txt b/src/curieimu/CMakeLists.txt index 2674f892..dcb7665b 100644 --- a/src/curieimu/CMakeLists.txt +++ b/src/curieimu/CMakeLists.txt @@ -7,5 +7,5 @@ if (HAVE_FIRMATA) set (libdescription "Curie IMU via Firmata") set (module_src ${libname}.cpp) set (module_hpp ${libname}.hpp) - upm_module_init () + upm_module_init (mraa) endif () diff --git a/src/cwlsxxa/CMakeLists.txt b/src/cwlsxxa/CMakeLists.txt index 0dd20eeb..4fa56da7 100644 --- a/src/cwlsxxa/CMakeLists.txt +++ b/src/cwlsxxa/CMakeLists.txt @@ -2,4 +2,4 @@ set (libname "cwlsxxa") set (libdescription "Veris CWLSXXA CO2/Temperature/Humidity transmitter") set (module_src ${libname}.cxx) set (module_hpp ${libname}.hpp) -upm_module_init() +upm_module_init(mraa) diff --git a/src/ds1307/CMakeLists.txt b/src/ds1307/CMakeLists.txt index 48a5a84d..3d527b65 100644 --- a/src/ds1307/CMakeLists.txt +++ b/src/ds1307/CMakeLists.txt @@ -2,4 +2,4 @@ set (libname "ds1307") set (libdescription "Real time clock (RTC) module") set (module_src ${libname}.cxx) set (module_hpp ${libname}.hpp) -upm_module_init() +upm_module_init(mraa) diff --git a/src/ds1808lc/CMakeLists.txt b/src/ds1808lc/CMakeLists.txt index 48a532af..1f15ce96 100644 --- a/src/ds1808lc/CMakeLists.txt +++ b/src/ds1808lc/CMakeLists.txt @@ -2,4 +2,4 @@ set (libname "ds1808lc") set (libdescription "DS1808 lighting controller") set (module_src ${libname}.cxx mraa-utils.cxx) set (module_hpp ${libname}.hpp) -upm_module_init(interfaces) +upm_module_init(interfaces mraa) diff --git a/src/ds2413/CMakeLists.txt b/src/ds2413/CMakeLists.txt index 49005ae1..292d7fff 100644 --- a/src/ds2413/CMakeLists.txt +++ b/src/ds2413/CMakeLists.txt @@ -2,4 +2,4 @@ set (libname "ds2413") set (libdescription "DS2413 1-wire Dual Channel Addressable Switch module") set (module_src ${libname}.cxx) set (module_hpp ${libname}.hpp) -upm_module_init() +upm_module_init(mraa) diff --git a/src/ecs1030/CMakeLists.txt b/src/ecs1030/CMakeLists.txt index caaf58ef..6298b663 100644 --- a/src/ecs1030/CMakeLists.txt +++ b/src/ecs1030/CMakeLists.txt @@ -2,4 +2,4 @@ set (libname "ecs1030") set (libdescription "Non-invasive current sensor") set (module_src ${libname}.cxx) set (module_hpp ${libname}.hpp) -upm_module_init() +upm_module_init(mraa) diff --git a/src/grove/CMakeLists.txt b/src/grove/CMakeLists.txt index 4a1070e5..9f8f43f6 100644 --- a/src/grove/CMakeLists.txt +++ b/src/grove/CMakeLists.txt @@ -2,4 +2,4 @@ set (libname "grove") set (libdescription "Grove module") set (module_src grovebutton.cxx groveled.cxx grovelight.cxx groverelay.cxx groverotary.cxx groveslide.cxx grovetemp.cxx) set (module_hpp grovebutton.hpp groveled.hpp grovelight.hpp groverelay.hpp groverotary.hpp groveslide.hpp grovetemp.hpp grovebase.hpp grove.hpp) -upm_module_init() +upm_module_init(mraa) diff --git a/src/grovecollision/CMakeLists.txt b/src/grovecollision/CMakeLists.txt index 3dfd6173..d43c5305 100644 --- a/src/grovecollision/CMakeLists.txt +++ b/src/grovecollision/CMakeLists.txt @@ -2,4 +2,4 @@ set (libname "grovecollision") set (libdescription "Grovecollision sensor module") set (module_src ${libname}.cxx) set (module_hpp ${libname}.hpp) -upm_module_init() +upm_module_init(mraa) diff --git a/src/groveehr/CMakeLists.txt b/src/groveehr/CMakeLists.txt index 6baff16f..758dedac 100644 --- a/src/groveehr/CMakeLists.txt +++ b/src/groveehr/CMakeLists.txt @@ -2,4 +2,4 @@ set (libname "groveehr") set (libdescription "Grove ear-clip heart rate sensor module") set (module_src ${libname}.cxx) set (module_hpp ${libname}.hpp) -upm_module_init() +upm_module_init(mraa) diff --git a/src/groveeldriver/CMakeLists.txt b/src/groveeldriver/CMakeLists.txt index abd966cd..7afc84be 100644 --- a/src/groveeldriver/CMakeLists.txt +++ b/src/groveeldriver/CMakeLists.txt @@ -2,4 +2,4 @@ set (libname "groveeldriver") set (libdescription "Groveeldriver sensor module") set (module_src ${libname}.cxx) set (module_hpp ${libname}.hpp) -upm_module_init() +upm_module_init(mraa) diff --git a/src/groveelectromagnet/CMakeLists.txt b/src/groveelectromagnet/CMakeLists.txt index 8d691844..fab0fb2d 100644 --- a/src/groveelectromagnet/CMakeLists.txt +++ b/src/groveelectromagnet/CMakeLists.txt @@ -2,4 +2,4 @@ set (libname "groveelectromagnet") set (libdescription "Groveelectromagnet sensor module") set (module_src ${libname}.cxx) set (module_hpp ${libname}.hpp) -upm_module_init() +upm_module_init(mraa) diff --git a/src/groveemg/CMakeLists.txt b/src/groveemg/CMakeLists.txt index a336ba41..cb690cfa 100644 --- a/src/groveemg/CMakeLists.txt +++ b/src/groveemg/CMakeLists.txt @@ -2,4 +2,4 @@ set (libname "groveemg") set (libdescription "Groveemg muscle signal reader sensor module") set (module_src ${libname}.cxx) set (module_hpp ${libname}.hpp) -upm_module_init() +upm_module_init(mraa) diff --git a/src/grovegprs/CMakeLists.txt b/src/grovegprs/CMakeLists.txt index 7aa04cdf..b989d0d8 100644 --- a/src/grovegprs/CMakeLists.txt +++ b/src/grovegprs/CMakeLists.txt @@ -2,4 +2,4 @@ set (libname "grovegprs") set (libdescription "Grove GPRS module") set (module_src ${libname}.cxx) set (module_hpp ${libname}.hpp) -upm_module_init() +upm_module_init(mraa) diff --git a/src/grovegsr/CMakeLists.txt b/src/grovegsr/CMakeLists.txt index a46e4c76..15c999e9 100644 --- a/src/grovegsr/CMakeLists.txt +++ b/src/grovegsr/CMakeLists.txt @@ -2,4 +2,4 @@ set (libname "grovegsr") set (libdescription "Grovegsr galvanic skin response sensor module") set (module_src ${libname}.cxx) set (module_hpp ${libname}.hpp) -upm_module_init() +upm_module_init(mraa) diff --git a/src/grovelinefinder/CMakeLists.txt b/src/grovelinefinder/CMakeLists.txt index 63fd54e7..b301a1de 100644 --- a/src/grovelinefinder/CMakeLists.txt +++ b/src/grovelinefinder/CMakeLists.txt @@ -2,4 +2,4 @@ set (libname "grovelinefinder") set (libdescription "Grove line finder sensor module") set (module_src ${libname}.cxx) set (module_hpp ${libname}.hpp) -upm_module_init() +upm_module_init(mraa) diff --git a/src/grovemd/CMakeLists.txt b/src/grovemd/CMakeLists.txt index 3a79bc11..46942cff 100644 --- a/src/grovemd/CMakeLists.txt +++ b/src/grovemd/CMakeLists.txt @@ -2,4 +2,4 @@ set (libname "grovemd") set (libdescription "Grove i2c motor driver module") set (module_src ${libname}.cxx) set (module_hpp ${libname}.hpp) -upm_module_init() +upm_module_init(mraa) diff --git a/src/grovemoisture/CMakeLists.txt b/src/grovemoisture/CMakeLists.txt index 6d9d9021..a5523cb5 100644 --- a/src/grovemoisture/CMakeLists.txt +++ b/src/grovemoisture/CMakeLists.txt @@ -2,4 +2,4 @@ set (libname "grovemoisture") set (libdescription "Grove moisture module") set (module_src ${libname}.cxx) set (module_hpp ${libname}.hpp) -upm_module_init() +upm_module_init(mraa) diff --git a/src/groveo2/CMakeLists.txt b/src/groveo2/CMakeLists.txt index 4026247f..09534a29 100644 --- a/src/groveo2/CMakeLists.txt +++ b/src/groveo2/CMakeLists.txt @@ -2,4 +2,4 @@ set (libname "groveo2") set (libdescription "GroveO2 oxygen concentration sensor module") set (module_src ${libname}.cxx) set (module_hpp ${libname}.hpp) -upm_module_init() +upm_module_init(mraa) diff --git a/src/grovescam/CMakeLists.txt b/src/grovescam/CMakeLists.txt index 3acf7c9f..c5b462a9 100644 --- a/src/grovescam/CMakeLists.txt +++ b/src/grovescam/CMakeLists.txt @@ -2,4 +2,4 @@ set (libname "grovescam") set (libdescription "Grove serial camera module") set (module_src ${libname}.cxx) set (module_hpp ${libname}.hpp) -upm_module_init() +upm_module_init(mraa) diff --git a/src/grovespeaker/CMakeLists.txt b/src/grovespeaker/CMakeLists.txt index 2a7b85ea..8a51b3a5 100644 --- a/src/grovespeaker/CMakeLists.txt +++ b/src/grovespeaker/CMakeLists.txt @@ -2,4 +2,4 @@ set (libname "grovespeaker") set (libdescription "Grovespeaker speaker module") set (module_src ${libname}.cxx) set (module_hpp ${libname}.hpp) -upm_module_init() +upm_module_init(mraa) diff --git a/src/groveultrasonic/CMakeLists.txt b/src/groveultrasonic/CMakeLists.txt index 2f92f1e0..7004d491 100644 --- a/src/groveultrasonic/CMakeLists.txt +++ b/src/groveultrasonic/CMakeLists.txt @@ -2,4 +2,4 @@ set (libname "groveultrasonic") set (libdescription "Grove ultrasonic proximity sensor") set (module_src ${libname}.cxx) set (module_hpp ${libname}.hpp) -upm_module_init() +upm_module_init(mraa) diff --git a/src/grovevdiv/CMakeLists.txt b/src/grovevdiv/CMakeLists.txt index d5d8b68b..0e66cea5 100644 --- a/src/grovevdiv/CMakeLists.txt +++ b/src/grovevdiv/CMakeLists.txt @@ -2,4 +2,4 @@ set (libname "grovevdiv") set (libdescription "Grove voltage divider module") set (module_src ${libname}.cxx) set (module_hpp ${libname}.hpp) -upm_module_init() +upm_module_init(mraa) diff --git a/src/grovewater/CMakeLists.txt b/src/grovewater/CMakeLists.txt index a80719b2..5dd996d3 100644 --- a/src/grovewater/CMakeLists.txt +++ b/src/grovewater/CMakeLists.txt @@ -2,4 +2,4 @@ set (libname "grovewater") set (libdescription "Grove water module") set (module_src ${libname}.cxx) set (module_hpp ${libname}.hpp) -upm_module_init() +upm_module_init(mraa) diff --git a/src/grovewfs/CMakeLists.txt b/src/grovewfs/CMakeLists.txt index 9014619d..769a4077 100644 --- a/src/grovewfs/CMakeLists.txt +++ b/src/grovewfs/CMakeLists.txt @@ -2,4 +2,4 @@ set (libname "grovewfs") set (libdescription "Grove water flow sensor module") set (module_src ${libname}.cxx) set (module_hpp ${libname}.hpp) -upm_module_init() +upm_module_init(mraa) diff --git a/src/h3lis331dl/CMakeLists.txt b/src/h3lis331dl/CMakeLists.txt index e34b8075..63387d30 100644 --- a/src/h3lis331dl/CMakeLists.txt +++ b/src/h3lis331dl/CMakeLists.txt @@ -2,4 +2,4 @@ set (libname "h3lis331dl") set (libdescription "H3lis331dl I2c Accelerometer (400g)") set (module_src ${libname}.cxx) set (module_hpp ${libname}.hpp) -upm_module_init() +upm_module_init(mraa) diff --git a/src/hcsr04/CMakeLists.txt b/src/hcsr04/CMakeLists.txt index b3cdbcd8..62466423 100644 --- a/src/hcsr04/CMakeLists.txt +++ b/src/hcsr04/CMakeLists.txt @@ -2,4 +2,4 @@ set (libname "hcsr04") set (libdescription "Proximity sensor") set (module_src ${libname}.cxx) set (module_hpp ${libname}.hpp) -upm_module_init() +upm_module_init(mraa) diff --git a/src/hdxxvxta/CMakeLists.txt b/src/hdxxvxta/CMakeLists.txt index f948605b..52c4968c 100644 --- a/src/hdxxvxta/CMakeLists.txt +++ b/src/hdxxvxta/CMakeLists.txt @@ -2,4 +2,4 @@ set (libname "hdxxvxta") set (libdescription "Veris HDXXVXTA Temperature/Humidity transmitter") set (module_src ${libname}.cxx) set (module_hpp ${libname}.hpp) -upm_module_init() +upm_module_init(mraa) diff --git a/src/hlg150h/CMakeLists.txt b/src/hlg150h/CMakeLists.txt index 1eec48bd..3bd16a12 100644 --- a/src/hlg150h/CMakeLists.txt +++ b/src/hlg150h/CMakeLists.txt @@ -2,4 +2,4 @@ set (libname "hlg150h") set (libdescription "Lighting power supply") set (module_src ${libname}.cxx mraa-utils.cxx) set (module_hpp ${libname}.hpp) -upm_module_init() +upm_module_init(mraa interfaces) diff --git a/src/hm11/CMakeLists.txt b/src/hm11/CMakeLists.txt index 33a98330..9295e774 100644 --- a/src/hm11/CMakeLists.txt +++ b/src/hm11/CMakeLists.txt @@ -2,4 +2,4 @@ set (libname "hm11") set (libdescription "Grove hm11 bluetooth low energy module") set (module_src ${libname}.cxx) set (module_hpp ${libname}.hpp) -upm_module_init() +upm_module_init(mraa) diff --git a/src/hmtrp/CMakeLists.txt b/src/hmtrp/CMakeLists.txt index 291de983..53e276dd 100644 --- a/src/hmtrp/CMakeLists.txt +++ b/src/hmtrp/CMakeLists.txt @@ -2,4 +2,4 @@ set (libname "hmtrp") set (libdescription "Grove serial rf pro (hmtrp) module") set (module_src ${libname}.cxx) set (module_hpp ${libname}.hpp) -upm_module_init() +upm_module_init(mraa) diff --git a/src/hp20x/CMakeLists.txt b/src/hp20x/CMakeLists.txt index 2ed59ac6..52a199bd 100644 --- a/src/hp20x/CMakeLists.txt +++ b/src/hp20x/CMakeLists.txt @@ -2,4 +2,4 @@ set (libname "hp20x") set (libdescription "Grove barometer (high efficiency)") set (module_src ${libname}.cxx) set (module_hpp ${libname}.hpp) -upm_module_init() +upm_module_init(mraa) diff --git a/src/ht9170/CMakeLists.txt b/src/ht9170/CMakeLists.txt index 8c5aa7d6..93443748 100644 --- a/src/ht9170/CMakeLists.txt +++ b/src/ht9170/CMakeLists.txt @@ -2,4 +2,4 @@ set (libname "ht9170") set (libdescription "Ht9170 DTMF decoder") set (module_src ${libname}.cxx) set (module_hpp ${libname}.hpp) -upm_module_init() +upm_module_init(mraa) diff --git a/src/htu21d/CMakeLists.txt b/src/htu21d/CMakeLists.txt index b1eff60e..77886390 100644 --- a/src/htu21d/CMakeLists.txt +++ b/src/htu21d/CMakeLists.txt @@ -2,4 +2,4 @@ set (libname "htu21d") set (libdescription "Humidity Sensor") set (module_src ${libname}.cpp) set (module_hpp ${libname}.hpp) -upm_module_init() +upm_module_init(mraa) diff --git a/src/hx711/CMakeLists.txt b/src/hx711/CMakeLists.txt index 29c42c97..1d80a8f3 100644 --- a/src/hx711/CMakeLists.txt +++ b/src/hx711/CMakeLists.txt @@ -2,4 +2,4 @@ set (libname "hx711") set (libdescription "HX711 24bit ADC") set (module_src ${libname}.cxx) set (module_hpp ${libname}.hpp) -upm_module_init() +upm_module_init(mraa) diff --git a/src/ili9341/CMakeLists.txt b/src/ili9341/CMakeLists.txt index 6b8bd31a..04d838cd 100644 --- a/src/ili9341/CMakeLists.txt +++ b/src/ili9341/CMakeLists.txt @@ -2,4 +2,4 @@ set (libname "ili9341") set (libdescription "ILI9341 SPI LCD") set (module_src ili9341_gfx.cxx ili9341.cxx) set (module_hpp ili9341_gfx.hpp ili9341.hpp) -upm_module_init() +upm_module_init(mraa) diff --git a/src/ina132/CMakeLists.txt b/src/ina132/CMakeLists.txt index e70b4991..9f615af8 100644 --- a/src/ina132/CMakeLists.txt +++ b/src/ina132/CMakeLists.txt @@ -2,4 +2,4 @@ set (libname "ina132") set (libdescription "Ina132 differential amplifier sensor module") set (module_src ${libname}.cxx) set (module_hpp ${libname}.hpp) -upm_module_init() +upm_module_init(mraa) diff --git a/src/interfaces/CMakeLists.txt b/src/interfaces/CMakeLists.txt index 273e2695..faa11148 100644 --- a/src/interfaces/CMakeLists.txt +++ b/src/interfaces/CMakeLists.txt @@ -4,6 +4,9 @@ set (module_src ${libname}.cxx) upm_module_init() +# Add a PUBLIC include directory to the CMAKE src dir +target_include_directories (${libname} PUBLIC ${CMAKE_SOURCE_DIR}/src) + # Don't add the hpp files with upm_module_init, this allows # them to be installed separately set (module_hpp iADC.hpp diff --git a/src/isd1820/CMakeLists.txt b/src/isd1820/CMakeLists.txt index 4ec5f0f5..058edee2 100644 --- a/src/isd1820/CMakeLists.txt +++ b/src/isd1820/CMakeLists.txt @@ -2,4 +2,4 @@ set (libname "isd1820") set (libdescription "Grove recorder") set (module_src ${libname}.cxx) set (module_hpp ${libname}.hpp) -upm_module_init() +upm_module_init(mraa) diff --git a/src/itg3200/CMakeLists.txt b/src/itg3200/CMakeLists.txt index b574b11e..9549c1eb 100644 --- a/src/itg3200/CMakeLists.txt +++ b/src/itg3200/CMakeLists.txt @@ -2,4 +2,4 @@ set (libname "itg3200") set (libdescription "Digital Gyro") set (module_src ${libname}.cxx) set (module_hpp ${libname}.hpp) -upm_module_init() +upm_module_init(mraa) diff --git a/src/kxcjk1013/CMakeLists.txt b/src/kxcjk1013/CMakeLists.txt index 74ee2497..5b50de9a 100644 --- a/src/kxcjk1013/CMakeLists.txt +++ b/src/kxcjk1013/CMakeLists.txt @@ -2,4 +2,4 @@ set (libname "kxcjk1013") set (libdescription "Kxcjk1013 sensor module") set (module_src ${libname}.cxx) set (module_hpp ${libname}.hpp) -upm_module_init() +upm_module_init(mraa) diff --git a/src/l298/CMakeLists.txt b/src/l298/CMakeLists.txt index adcd6134..e515af87 100644 --- a/src/l298/CMakeLists.txt +++ b/src/l298/CMakeLists.txt @@ -2,4 +2,4 @@ set (libname "l298") set (libdescription "L298 dual h-bridge") set (module_src ${libname}.cxx) set (module_hpp ${libname}.hpp) -upm_module_init() +upm_module_init(mraa) diff --git a/src/l3gd20/CMakeLists.txt b/src/l3gd20/CMakeLists.txt index 27846005..5e5546f9 100644 --- a/src/l3gd20/CMakeLists.txt +++ b/src/l3gd20/CMakeLists.txt @@ -2,4 +2,4 @@ set (libname "l3gd20") set (libdescription "L3gd20 sensor module") set (module_src ${libname}.cxx) set (module_hpp ${libname}.hpp) -upm_module_init() +upm_module_init(mraa) diff --git a/src/lcd/CMakeLists.txt b/src/lcd/CMakeLists.txt index a920fef1..737ec6b0 100644 --- a/src/lcd/CMakeLists.txt +++ b/src/lcd/CMakeLists.txt @@ -2,4 +2,4 @@ set (libname "i2clcd") set (libdescription "Lcd/oled displays") set (module_src lcd.cxx lcm1602.cxx jhd1313m1.cxx ssd1308.cxx eboled.cxx ssd1327.cxx sainsmartks.cxx ssd1306.cxx) set (module_hpp lcd.hpp lcm1602.hpp jhd1313m1.hpp ssd1308.hpp eboled.hpp ssd1327.hpp ssd.hpp sainsmartks.hpp ssd1306.hpp) -upm_module_init() +upm_module_init(mraa) diff --git a/src/lol/CMakeLists.txt b/src/lol/CMakeLists.txt index 694e7bfe..a71fa78a 100644 --- a/src/lol/CMakeLists.txt +++ b/src/lol/CMakeLists.txt @@ -2,4 +2,4 @@ set (libname "lol") set (libdescription "LoL Olimex LoL rev A") set (module_src ${libname}.cxx) set (module_hpp ${libname}.hpp) -upm_module_init() +upm_module_init(mraa) diff --git a/src/lp8860/CMakeLists.txt b/src/lp8860/CMakeLists.txt index 92428ab2..25f90387 100644 --- a/src/lp8860/CMakeLists.txt +++ b/src/lp8860/CMakeLists.txt @@ -2,4 +2,4 @@ set (libname "lp8860") set (libdescription "LED lighting controller") set (module_src ${libname}.cxx mraa-utils.cxx) set (module_hpp ${libname}.hpp) -upm_module_init() +upm_module_init(mraa interfaces) diff --git a/src/lpd8806/CMakeLists.txt b/src/lpd8806/CMakeLists.txt index 1157dcdb..f7ed1780 100644 --- a/src/lpd8806/CMakeLists.txt +++ b/src/lpd8806/CMakeLists.txt @@ -2,4 +2,4 @@ set (libname "lpd8806") set (libdescription "Digital RGB LED strip") set (module_src ${libname}.cxx) set (module_hpp ${libname}.hpp) -upm_module_init() +upm_module_init(mraa) diff --git a/src/lsm303/CMakeLists.txt b/src/lsm303/CMakeLists.txt index 495c4ac8..53b592f9 100644 --- a/src/lsm303/CMakeLists.txt +++ b/src/lsm303/CMakeLists.txt @@ -2,4 +2,4 @@ set (libname "lsm303") set (libdescription "Triaxial accelerometer/magnetometer") set (module_src ${libname}.cxx) set (module_hpp ${libname}.hpp) -upm_module_init() +upm_module_init(mraa) diff --git a/src/lsm9ds0/CMakeLists.txt b/src/lsm9ds0/CMakeLists.txt index 2f32bda9..4cd3d831 100644 --- a/src/lsm9ds0/CMakeLists.txt +++ b/src/lsm9ds0/CMakeLists.txt @@ -2,4 +2,4 @@ set (libname "lsm9ds0") set (libdescription "Gyro, accelerometer and magnometer sensor based on lsm9ds0") set (module_src ${libname}.cxx) set (module_hpp ${libname}.hpp) -upm_module_init() +upm_module_init(mraa) diff --git a/src/max31723/CMakeLists.txt b/src/max31723/CMakeLists.txt index f6e5c72c..82462c3e 100644 --- a/src/max31723/CMakeLists.txt +++ b/src/max31723/CMakeLists.txt @@ -2,4 +2,4 @@ set (libname "max31723") set (libdescription "Very accurate temperature sensor") set (module_src ${libname}.cxx) set (module_hpp ${libname}.hpp) -upm_module_init() +upm_module_init(mraa) diff --git a/src/max31855/CMakeLists.txt b/src/max31855/CMakeLists.txt index 312ee00a..d8ec0f79 100644 --- a/src/max31855/CMakeLists.txt +++ b/src/max31855/CMakeLists.txt @@ -2,4 +2,4 @@ set (libname "max31855") set (libdescription "K type thermistor amplifier") set (module_src ${libname}.cxx) set (module_hpp ${libname}.hpp) -upm_module_init() +upm_module_init(mraa) diff --git a/src/max44000/CMakeLists.txt b/src/max44000/CMakeLists.txt index 89226543..35b17168 100644 --- a/src/max44000/CMakeLists.txt +++ b/src/max44000/CMakeLists.txt @@ -2,4 +2,4 @@ set (libname "max44000") set (libdescription "MAX44000") set (module_src ${libname}.cxx) set (module_hpp ${libname}.hpp) -upm_module_init() +upm_module_init(mraa) diff --git a/src/max44009/CMakeLists.txt b/src/max44009/CMakeLists.txt index ca607af9..509be284 100644 --- a/src/max44009/CMakeLists.txt +++ b/src/max44009/CMakeLists.txt @@ -2,4 +2,4 @@ set (libname "max44009") set (libdescription "MAX44009") set (module_src ${libname}.cxx) set (module_hpp ${libname}.hpp) -upm_module_init() +upm_module_init(mraa interfaces) diff --git a/src/max5487/CMakeLists.txt b/src/max5487/CMakeLists.txt index d546ebdd..16e21520 100644 --- a/src/max5487/CMakeLists.txt +++ b/src/max5487/CMakeLists.txt @@ -2,4 +2,4 @@ set (libname "max5487") set (libdescription "Digital potentiometer") set (module_src ${libname}.cxx) set (module_hpp ${libname}.hpp) -upm_module_init() +upm_module_init(mraa) diff --git a/src/maxds3231m/CMakeLists.txt b/src/maxds3231m/CMakeLists.txt index b9c8fa67..d4b65e70 100644 --- a/src/maxds3231m/CMakeLists.txt +++ b/src/maxds3231m/CMakeLists.txt @@ -2,4 +2,4 @@ set (libname "maxds3231m") set (libdescription "Realtime clock sensor from MAX family") set (module_src ${libname}.cxx) set (module_hpp ${libname}.hpp) -upm_module_init() +upm_module_init(mraa) diff --git a/src/maxsonarez/CMakeLists.txt b/src/maxsonarez/CMakeLists.txt index a4491907..c85b7789 100644 --- a/src/maxsonarez/CMakeLists.txt +++ b/src/maxsonarez/CMakeLists.txt @@ -2,4 +2,4 @@ set (libname "maxsonarez") set (libdescription "MaxSonar EZ family of ultrasonic rangers") set (module_src ${libname}.cxx) set (module_hpp ${libname}.hpp) -upm_module_init() +upm_module_init(mraa) diff --git a/src/mcp9808/CMakeLists.txt b/src/mcp9808/CMakeLists.txt index e827e17d..9e54e39f 100644 --- a/src/mcp9808/CMakeLists.txt +++ b/src/mcp9808/CMakeLists.txt @@ -2,4 +2,4 @@ set (libname "mcp9808") set (libdescription "Precision I2C temperature sensor") set (module_src ${libname}.cxx) set (module_hpp ${libname}.hpp) -upm_module_init() +upm_module_init(mraa) diff --git a/src/mg811/CMakeLists.txt b/src/mg811/CMakeLists.txt index 3c4a4945..8445ddde 100644 --- a/src/mg811/CMakeLists.txt +++ b/src/mg811/CMakeLists.txt @@ -2,4 +2,4 @@ set (libname "mg811") set (libdescription "DFRobot CO2 sensor") set (module_src ${libname}.cxx) set (module_hpp ${libname}.hpp) -upm_module_init() +upm_module_init(mraa) diff --git a/src/mhz16/CMakeLists.txt b/src/mhz16/CMakeLists.txt index fc5e6cc9..1135d9bb 100644 --- a/src/mhz16/CMakeLists.txt +++ b/src/mhz16/CMakeLists.txt @@ -2,4 +2,4 @@ set (libname "mhz16") set (libdescription "Grove CO2 sensor") set (module_src ${libname}.cxx) set (module_hpp ${libname}.hpp) -upm_module_init() +upm_module_init(mraa) diff --git a/src/micsv89/CMakeLists.txt b/src/micsv89/CMakeLists.txt index d9831388..22e72069 100644 --- a/src/micsv89/CMakeLists.txt +++ b/src/micsv89/CMakeLists.txt @@ -2,4 +2,4 @@ set (libname "micsv89") set (libdescription "Micsv89 environmental sensor module") set (module_src ${libname}.cxx) set (module_hpp ${libname}.hpp) -upm_module_init() +upm_module_init(mraa) diff --git a/src/mlx90614/CMakeLists.txt b/src/mlx90614/CMakeLists.txt index 28d3be78..04785a37 100644 --- a/src/mlx90614/CMakeLists.txt +++ b/src/mlx90614/CMakeLists.txt @@ -2,4 +2,4 @@ set (libname "mlx90614") set (libdescription "Infrared thermometer designed for non-contact emperature sensing") set (module_src ${libname}.cxx) set (module_hpp ${libname}.hpp) -upm_module_init() +upm_module_init(mraa) diff --git a/src/mma7455/CMakeLists.txt b/src/mma7455/CMakeLists.txt index 49950f3f..fc2c2535 100644 --- a/src/mma7455/CMakeLists.txt +++ b/src/mma7455/CMakeLists.txt @@ -2,4 +2,4 @@ set (libname "mma7455") set (libdescription "Freescale Semiconductor 3-axis accelerometer module") set (module_src ${libname}.cxx) set (module_hpp ${libname}.hpp) -upm_module_init() +upm_module_init(mraa) diff --git a/src/mpl3115a2/CMakeLists.txt b/src/mpl3115a2/CMakeLists.txt index ea7f40e6..d7594f21 100644 --- a/src/mpl3115a2/CMakeLists.txt +++ b/src/mpl3115a2/CMakeLists.txt @@ -2,4 +2,4 @@ set (libname "mpl3115a2") set (libdescription "Pressure/Temperature Sensor") set (module_src ${libname}.cpp) set (module_hpp ${libname}.hpp) -upm_module_init() +upm_module_init(mraa) diff --git a/src/mpu9150/CMakeLists.txt b/src/mpu9150/CMakeLists.txt index 19899426..47d0f952 100644 --- a/src/mpu9150/CMakeLists.txt +++ b/src/mpu9150/CMakeLists.txt @@ -2,4 +2,4 @@ set (libname "mpu9150") set (libdescription "Gyro, acceleromter and magnometer sensor based on mpu9150") set (module_src ${libname}.cxx ak8975.cxx mpu60x0.cxx mpu9250.cxx) set (module_hpp ${libname}.hpp ak8975.hpp mpu60x0.hpp mpu9250.hpp) -upm_module_init() +upm_module_init(mraa) diff --git a/src/ms5611/CMakeLists.txt b/src/ms5611/CMakeLists.txt index 3aaf4592..fa48006b 100644 --- a/src/ms5611/CMakeLists.txt +++ b/src/ms5611/CMakeLists.txt @@ -2,4 +2,4 @@ set (libname "ms5611") set (libdescription "Pressure and temperature sensor") set (module_src ${libname}.cxx) set (module_hpp ${libname}.hpp) -upm_module_init() +upm_module_init(mraa interfaces) diff --git a/src/nlgpio16/CMakeLists.txt b/src/nlgpio16/CMakeLists.txt index e86e2e82..67eeb856 100644 --- a/src/nlgpio16/CMakeLists.txt +++ b/src/nlgpio16/CMakeLists.txt @@ -2,4 +2,4 @@ set (libname "nlgpio16") set (libdescription "Module for the Numato Labs GPIO 16 USB") set (module_src ${libname}.cxx) set (module_hpp ${libname}.hpp) -upm_module_init() +upm_module_init(mraa) diff --git a/src/nrf24l01/CMakeLists.txt b/src/nrf24l01/CMakeLists.txt index 227883c7..a09b0140 100644 --- a/src/nrf24l01/CMakeLists.txt +++ b/src/nrf24l01/CMakeLists.txt @@ -2,4 +2,4 @@ set (libname "nrf24l01") set (libdescription "NRF tx/rx") set (module_src ${libname}.cxx) set (module_hpp ${libname}.hpp) -upm_module_init() +upm_module_init(mraa) diff --git a/src/nrf8001/CMakeLists.txt b/src/nrf8001/CMakeLists.txt index 15c606ba..a721d237 100644 --- a/src/nrf8001/CMakeLists.txt +++ b/src/nrf8001/CMakeLists.txt @@ -2,4 +2,4 @@ set (libname "nrf8001") set (libdescription "BLE module from NordicSemiconductor family") set (module_src hal_aci_tl.cpp aci_setup.cpp aci_queue.cpp acilib.cpp lib_aci.cpp ${libname}.cxx) set (module_hpp hal_aci_tl.h aci_setup.h aci_queue.h acilib.h lib_aci.h ${libname}.hpp) -upm_module_init() +upm_module_init(mraa) diff --git a/src/pca9685/CMakeLists.txt b/src/pca9685/CMakeLists.txt index 7958cf6f..0579a184 100644 --- a/src/pca9685/CMakeLists.txt +++ b/src/pca9685/CMakeLists.txt @@ -2,4 +2,4 @@ set (libname "pca9685") set (libdescription "Pca9685 I2C 16ch, 12b pwm, LED controller") set (module_src ${libname}.cxx) set (module_hpp ${libname}.hpp) -upm_module_init() +upm_module_init(mraa) diff --git a/src/pn532/CMakeLists.txt b/src/pn532/CMakeLists.txt index a6d55341..bea5d962 100644 --- a/src/pn532/CMakeLists.txt +++ b/src/pn532/CMakeLists.txt @@ -2,4 +2,4 @@ set (libname "pn532") set (libdescription "Pn532 NFC/RFID reader/writer") set (module_src ${libname}.cxx) set (module_hpp ${libname}.hpp) -upm_module_init() +upm_module_init(mraa) diff --git a/src/pulsensor/CMakeLists.txt b/src/pulsensor/CMakeLists.txt index b34e6418..7785be32 100644 --- a/src/pulsensor/CMakeLists.txt +++ b/src/pulsensor/CMakeLists.txt @@ -2,4 +2,4 @@ set (libname "pulsensor") set (libdescription "3-Wire pulse sensor") set (module_src ${libname}.cxx) set (module_hpp ${libname}.hpp) -upm_module_init() +upm_module_init(mraa) diff --git a/src/rf22/CMakeLists.txt b/src/rf22/CMakeLists.txt index d2d6bb1f..1c23cbd1 100644 --- a/src/rf22/CMakeLists.txt +++ b/src/rf22/CMakeLists.txt @@ -2,4 +2,4 @@ set (libname "rf22") set (libdescription "HopeRF RFM22B ISM Band Radio Module") set (module_src ${libname}.cxx) set (module_hpp ${libname}.hpp) -upm_module_init() +upm_module_init(mraa) diff --git a/src/rfr359f/CMakeLists.txt b/src/rfr359f/CMakeLists.txt index bee5d96a..57d6e1b5 100644 --- a/src/rfr359f/CMakeLists.txt +++ b/src/rfr359f/CMakeLists.txt @@ -2,4 +2,4 @@ set (libname "rfr359f") set (libdescription "Rfr359f grove distance interrupter") set (module_src ${libname}.cxx) set (module_hpp ${libname}.hpp) -upm_module_init() +upm_module_init(mraa) diff --git a/src/rgbringcoder/CMakeLists.txt b/src/rgbringcoder/CMakeLists.txt index c79f099a..1b0b142b 100644 --- a/src/rgbringcoder/CMakeLists.txt +++ b/src/rgbringcoder/CMakeLists.txt @@ -2,4 +2,4 @@ set (libname "rgbringcoder") set (libdescription "Sparkfun RGB RingCoder") set (module_src ${libname}.cxx) set (module_hpp ${libname}.hpp) -upm_module_init() +upm_module_init(mraa) diff --git a/src/rhusb/CMakeLists.txt b/src/rhusb/CMakeLists.txt index 073d531b..724bb9e6 100644 --- a/src/rhusb/CMakeLists.txt +++ b/src/rhusb/CMakeLists.txt @@ -2,5 +2,5 @@ set (libname "rhusb") set (libdescription "Module for the Omega RH-USB sensor") set (module_src ${libname}.cxx) set (module_hpp ${libname}.hpp) -upm_module_init() +upm_module_init(mraa) diff --git a/src/si1132/CMakeLists.txt b/src/si1132/CMakeLists.txt index 3412a729..6d239b48 100644 --- a/src/si1132/CMakeLists.txt +++ b/src/si1132/CMakeLists.txt @@ -2,4 +2,4 @@ set (libname "si1132") set (libdescription "UV and ambient light sensor") set (module_src ${libname}.cxx) set (module_hpp ${libname}.hpp) -upm_module_init() +upm_module_init(mraa interfaces) diff --git a/src/si114x/CMakeLists.txt b/src/si114x/CMakeLists.txt index fa31aebe..d43a51c8 100644 --- a/src/si114x/CMakeLists.txt +++ b/src/si114x/CMakeLists.txt @@ -2,4 +2,4 @@ set (libname "si114x") set (libdescription "Si114x UV/IR/Visible light sensor") set (module_src ${libname}.cxx) set (module_hpp ${libname}.hpp) -upm_module_init() +upm_module_init(mraa) diff --git a/src/si7005/CMakeLists.txt b/src/si7005/CMakeLists.txt index ce35e210..41e2ea98 100644 --- a/src/si7005/CMakeLists.txt +++ b/src/si7005/CMakeLists.txt @@ -2,4 +2,4 @@ set (libname "si7005") set (libdescription "Digital I2C humidity and temperature sensor") set (module_src ${libname}.cxx mraa-utils.cxx) set (module_hpp ${libname}.hpp) -upm_module_init() +upm_module_init(mraa interfaces) diff --git a/src/sm130/CMakeLists.txt b/src/sm130/CMakeLists.txt index 799e3879..e2a07d84 100644 --- a/src/sm130/CMakeLists.txt +++ b/src/sm130/CMakeLists.txt @@ -2,4 +2,4 @@ set (libname "sm130") set (libdescription "Rfid reader") set (module_src ${libname}.cxx) set (module_hpp ${libname}.hpp) -upm_module_init() +upm_module_init(mraa) diff --git a/src/smartdrive/CMakeLists.txt b/src/smartdrive/CMakeLists.txt index 34eaecdb..ff213610 100644 --- a/src/smartdrive/CMakeLists.txt +++ b/src/smartdrive/CMakeLists.txt @@ -2,4 +2,4 @@ set (libname "smartdrive") set (libdescription "SmartDrive") set (module_src ${libname}.cxx) set (module_hpp ${libname}.hpp) -upm_module_init() +upm_module_init(mraa) diff --git a/src/ssd1351/CMakeLists.txt b/src/ssd1351/CMakeLists.txt index 8d0a4db5..b37b3352 100644 --- a/src/ssd1351/CMakeLists.txt +++ b/src/ssd1351/CMakeLists.txt @@ -2,4 +2,4 @@ set (libname "ssd1351") set (libdescription "SSD1351 SPI LCD") set (module_src ssd1351_gfx.cxx ssd1351.cxx) set (module_hpp ssd1351_gfx.hpp ssd1351.hpp) -upm_module_init() +upm_module_init(mraa) diff --git a/src/st7735/CMakeLists.txt b/src/st7735/CMakeLists.txt index 923538ee..0842f57d 100644 --- a/src/st7735/CMakeLists.txt +++ b/src/st7735/CMakeLists.txt @@ -2,4 +2,4 @@ set (libname "st7735") set (libdescription "SPI LCD") set (module_src st7735_gfx.cxx st7735.cxx) set (module_hpp st7735_gfx.hpp st7735.hpp) -upm_module_init() +upm_module_init(mraa) diff --git a/src/stepmotor/CMakeLists.txt b/src/stepmotor/CMakeLists.txt index 32c433ed..281f1606 100644 --- a/src/stepmotor/CMakeLists.txt +++ b/src/stepmotor/CMakeLists.txt @@ -2,5 +2,5 @@ set (libname "stepmotor") set (libdescription "Stepper motor module") set (module_src ${libname}.cxx) set (module_hpp ${libname}.hpp) -upm_module_init() +upm_module_init(mraa) target_link_libraries(${libname} rt) diff --git a/src/sx1276/CMakeLists.txt b/src/sx1276/CMakeLists.txt index d5078cf3..820279de 100644 --- a/src/sx1276/CMakeLists.txt +++ b/src/sx1276/CMakeLists.txt @@ -2,4 +2,4 @@ set (libname "sx1276") set (libdescription "SZ1276 LoRa/FSK/OOK radio") set (module_src ${libname}.cxx) set (module_hpp ${libname}.hpp) -upm_module_init() +upm_module_init(mraa) diff --git a/src/sx6119/CMakeLists.txt b/src/sx6119/CMakeLists.txt index 89fdd083..9c20b2c5 100644 --- a/src/sx6119/CMakeLists.txt +++ b/src/sx6119/CMakeLists.txt @@ -2,4 +2,4 @@ set (libname "sx6119") set (libdescription "Grove FM receiver") set (module_src ${libname}.cxx) set (module_hpp ${libname}.hpp) -upm_module_init() +upm_module_init(mraa) diff --git a/src/t6713/CMakeLists.txt b/src/t6713/CMakeLists.txt index da6d04aa..0c1e9bea 100644 --- a/src/t6713/CMakeLists.txt +++ b/src/t6713/CMakeLists.txt @@ -2,4 +2,4 @@ set (libname "t6713") set (libdescription "Amphenol Telaire 6713 Series CO2 Module") set (module_src ${libname}.cxx) set (module_hpp ${libname}.hpp) -upm_module_init() +upm_module_init(mraa interfaces) diff --git a/src/ta12200/CMakeLists.txt b/src/ta12200/CMakeLists.txt index f294e5fb..52b56d4d 100644 --- a/src/ta12200/CMakeLists.txt +++ b/src/ta12200/CMakeLists.txt @@ -2,4 +2,4 @@ set (libname "ta12200") set (libdescription "Ta12200 current transformer module") set (module_src ${libname}.cxx) set (module_hpp ${libname}.hpp) -upm_module_init() +upm_module_init(mraa) diff --git a/src/tcs3414cs/CMakeLists.txt b/src/tcs3414cs/CMakeLists.txt index 7d68dc64..2736a588 100644 --- a/src/tcs3414cs/CMakeLists.txt +++ b/src/tcs3414cs/CMakeLists.txt @@ -2,4 +2,4 @@ set (libname "tcs3414cs") set (libdescription "I2C Color sensor") set (module_src ${libname}.cxx) set (module_hpp ${libname}.hpp) -upm_module_init() +upm_module_init(mraa) diff --git a/src/teams/CMakeLists.txt b/src/teams/CMakeLists.txt index b0e8c8b5..d7f89a90 100644 --- a/src/teams/CMakeLists.txt +++ b/src/teams/CMakeLists.txt @@ -2,4 +2,4 @@ set (libname "teams") set (libdescription "Veris TEAMS Temperature transmitter") set (module_src ${libname}.cxx) set (module_hpp ${libname}.hpp) -upm_module_init() +upm_module_init(mraa) diff --git a/src/tex00/CMakeLists.txt b/src/tex00/CMakeLists.txt index 2856d62c..ef2f357d 100644 --- a/src/tex00/CMakeLists.txt +++ b/src/tex00/CMakeLists.txt @@ -2,4 +2,4 @@ set (libname "tex00") set (libdescription "Veris TEX00 Temperature thermistors") set (module_src ${libname}.cxx) set (module_hpp ${libname}.hpp) -upm_module_init() +upm_module_init(mraa) diff --git a/src/th02/CMakeLists.txt b/src/th02/CMakeLists.txt index 5ceb30e4..5ac30bff 100644 --- a/src/th02/CMakeLists.txt +++ b/src/th02/CMakeLists.txt @@ -2,4 +2,4 @@ set (libname "th02") set (libdescription "Temperature and Humidity Sensor Pro") set (module_src ${libname}.cxx) set (module_hpp ${libname}.hpp) -upm_module_init() +upm_module_init(mraa) diff --git a/src/tm1637/CMakeLists.txt b/src/tm1637/CMakeLists.txt index 0b0176d5..f08a37fb 100644 --- a/src/tm1637/CMakeLists.txt +++ b/src/tm1637/CMakeLists.txt @@ -2,4 +2,4 @@ set (libname "tm1637") set (libdescription "C++ API for the TM1637 7-segment display") set (module_src ${libname}.cxx) set (module_hpp ${libname}.hpp) -upm_module_init() +upm_module_init(mraa) diff --git a/src/ultrasonic/CMakeLists.txt b/src/ultrasonic/CMakeLists.txt index 2c65d9dd..d886ef3a 100644 --- a/src/ultrasonic/CMakeLists.txt +++ b/src/ultrasonic/CMakeLists.txt @@ -2,4 +2,4 @@ set (libname "ultrasonic") set (libdescription "Grove ultrasonic proximity sensor") set (module_src ${libname}.cxx) set (module_hpp ${libname}.hpp) -upm_module_init() +upm_module_init(mraa) diff --git a/src/waterlevel/CMakeLists.txt b/src/waterlevel/CMakeLists.txt index f745a0af..f7f0e162 100644 --- a/src/waterlevel/CMakeLists.txt +++ b/src/waterlevel/CMakeLists.txt @@ -2,4 +2,4 @@ set (libname "waterlevel") set (libdescription "Waterlevel sensor module") set (module_src ${libname}.cxx) set (module_hpp ${libname}.hpp) -upm_module_init() +upm_module_init(mraa) diff --git a/src/wheelencoder/CMakeLists.txt b/src/wheelencoder/CMakeLists.txt index ff0d7784..41d32064 100644 --- a/src/wheelencoder/CMakeLists.txt +++ b/src/wheelencoder/CMakeLists.txt @@ -2,4 +2,4 @@ set (libname "wheelencoder") set (libdescription "DFRobot wheelencoder") set (module_src ${libname}.cxx) set (module_hpp ${libname}.hpp) -upm_module_init() +upm_module_init(mraa) diff --git a/src/wt5001/CMakeLists.txt b/src/wt5001/CMakeLists.txt index f4ed45c6..1f9bc97c 100644 --- a/src/wt5001/CMakeLists.txt +++ b/src/wt5001/CMakeLists.txt @@ -2,4 +2,4 @@ set (libname "wt5001") set (libdescription "Grove serial mp3 (wt5001) module") set (module_src ${libname}.cxx) set (module_hpp ${libname}.hpp) -upm_module_init() +upm_module_init(mraa) diff --git a/src/xbee/CMakeLists.txt b/src/xbee/CMakeLists.txt index 58a395c2..1d4c6deb 100644 --- a/src/xbee/CMakeLists.txt +++ b/src/xbee/CMakeLists.txt @@ -2,4 +2,4 @@ set (libname "xbee") set (libdescription "XBee serial module") set (module_src ${libname}.cxx) set (module_hpp ${libname}.hpp) -upm_module_init() +upm_module_init(mraa) diff --git a/src/zfm20/CMakeLists.txt b/src/zfm20/CMakeLists.txt index 4e676d0f..513539a8 100644 --- a/src/zfm20/CMakeLists.txt +++ b/src/zfm20/CMakeLists.txt @@ -2,4 +2,4 @@ set (libname "zfm20") set (libdescription "Grove zfm20 fingerprint sensor module") set (module_src ${libname}.cxx) set (module_hpp ${libname}.hpp) -upm_module_init() +upm_module_init(mraa)