alexey.zholtikov/upm
1
0
Fork 0
mirror of https://github.com/eclipse/upm.git synced 2025-07-01 17:31:13 +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

20
src/ds18b20/CMakeLists.txt
View File

@ -1,9 +1,11 @@
upm_mixed_module_init (NAME ds18b20
DESCRIPTION "Programmable Resolution 1-Wire Digital Thermometer"
C_HDR ds18b20.h ds18b20_defs.h
C_SRC ds18b20.c
CPP_HDR ds18b20.hpp
CPP_SRC ds18b20.cxx
FTI_SRC ds18b20_fti.c
CPP_WRAPS_C
REQUIRES mraa)
if (MRAA_OW_FOUND)
upm_mixed_module_init (NAME ds18b20
DESCRIPTION "Programmable Resolution 1-Wire Digital Thermometer"
C_HDR ds18b20.h ds18b20_defs.h
C_SRC ds18b20.c
CPP_HDR ds18b20.hpp
CPP_SRC ds18b20.cxx
FTI_SRC ds18b20_fti.c
CPP_WRAPS_C
REQUIRES mraa utilities-c)
endif (MRAA_OW_FOUND)

2
src/ds18b20/ds18b20_fti.c
View File

@ -28,7 +28,7 @@
#include <stdlib.h>
#include "upm_fti.h"
#include "upm_sensor.h"
#include "fti/upm_sensor.h"
/**
* This file implements the Function Table Interface (FTI) for this sensor