alexey.zholtikov/upm
1
0
Fork 0
mirror of https://github.com/eclipse/upm.git synced 2025-07-02 01:41:12 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

ANDROID: CMake/src changes to build on android-24

Browse Source 
* Updated pom file generation: Generate pom files after all sensor
      library targets have been created - allows for dependencies
    * Changes for compiling on Android
    * Check for mraa build options: Look at symbols in mraa library to
      determine UPM build options (example: mraa_iio_init, mraa_firmata_init)
    * Add per target summary for C/C++/java/nodejs/python
    * Added hierarchy to fti include directory...
        old: #include "upm_voltage.h"
        new: #include "fti/upm_voltage.h"
    * Removed unimplemented methods from mpu9150 library and java example
    * Add utilities-c target for all c examples.  Most of the C examples
      rely on the upm_delay methods.  Add a dependency on the utilities-c
      target for all c examples.
    * Updated the examples/CMakeLists.txt to add dependencies passed via
      TARGETS to the target name parsed from the example name.  Also updated
      the interface example names to start with 'interfaces'.
    * Updated src/examples/CMakeLists.txt to ALWAYS remove examples from the
      example_src_list (moved this from end of function to beginning).

Signed-off-by: Noel Eck <noel.eck@intel.com>
This commit is contained in:
Noel Eck
2017-02-07 17:00:29 -08:00
parent b2aa2515b0
commit 0bd68e4e2b
93 changed files with 525 additions and 326 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/dfrec/CMakeLists.txt
View File

@ -1,13 +1,14 @@
upm_mixed_module_init (NAME dfrec
DESCRIPTION "Analog Electrical Conductivity (EC) Sensor"
C_HDR dfrec.h
C_SRC dfrec.c
CPP_HDR dfrec.hpp
CPP_SRC dfrec.cxx
FTI_SRC dfrec_fti.c
CPP_WRAPS_C
REQUIRES ds18b20 mraa)
# make sure the C library has the appropriate dependency on the UPM
# DS18B20 C library
target_link_libraries(${libnamec} ds18b20-c)
if (MRAA_OW_FOUND)
upm_mixed_module_init (NAME dfrec
DESCRIPTION "Analog Electrical Conductivity (EC) Sensor"
C_HDR dfrec.h
C_SRC dfrec.c
CPP_HDR dfrec.hpp
CPP_SRC dfrec.cxx
FTI_SRC dfrec_fti.c
CPP_WRAPS_C
REQUIRES ds18b20 mraa utilities-c)
# make sure the C library has the appropriate dependency on the UPM
# DS18B20 C library
target_link_libraries(${libnamec} ds18b20-c)
endif (MRAA_OW_FOUND)

1
src/dfrec/dfrec.cxx
View File

@ -23,6 +23,7 @@
*/
#include <iostream>
#include <string>
#include <stdexcept>
#include "dfrec.hpp"