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 <noel.eck@intel.com>

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

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}

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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 ()

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)
 

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)

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)

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)

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)

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)

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)

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)

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)