alexey.zholtikov/upm
1
0
Fork 0
mirror of https://github.com/eclipse/upm.git synced 2025-03-15 04:57:30 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added interface installing to cmake.

Browse Source 
You can use it by setting IFACE_HDR with the names of the required interfaces or set module_iface in the sensor's CMakeLists.txt file.
Example files: src/abp/CMakeLists.txt src/lm35/CMakeLists.txt

Signed-off-by: Serban Waltter <serban.waltter@rinftech.com>
This commit is contained in:
Serban Waltter 2018-06-21 16:29:09 +03:00
parent 2c238661ce
commit 360306db8d
3 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/CMakeLists.txt
View File

@ -685,6 +685,7 @@ endif (BUILDCORDOVA)
function (UPM_MIXED_MODULE_INIT) function (UPM_MIXED_MODULE_INIT)
# CPP_WRAPS_C -> Set to have CPP library link to C library # CPP_WRAPS_C -> Set to have CPP library link to C library
# DESCRIPTION -> Library description string # DESCRIPTION -> Library description string
# IFACE_HDR -> List of interface header files
# CPP_HDR -> List of CPP header files # CPP_HDR -> List of CPP header files
# CPP_SRC -> List of CPP source files # CPP_SRC -> List of CPP source files
# C_HDR -> List of C header files # C_HDR -> List of C header files
@ -696,7 +697,7 @@ function (UPM_MIXED_MODULE_INIT)
# libnamec -> C target name (if used) # libnamec -> C target name (if used)
set (options CPP_WRAPS_C) set (options CPP_WRAPS_C)
set (oneValueArgs NAME DESCRIPTION) set (oneValueArgs NAME DESCRIPTION)
set (multiValueArgs CPP_HDR CPP_SRC C_HDR C_SRC FTI_SRC FTI_HDR REQUIRES) set (multiValueArgs IFACE_HDR CPP_HDR CPP_SRC C_HDR C_SRC FTI_SRC FTI_HDR REQUIRES)
# Parse function parameters # Parse function parameters
cmake_parse_arguments(UPM_MIXED_MODULE_INIT "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} ) cmake_parse_arguments(UPM_MIXED_MODULE_INIT "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} )
@ -746,7 +747,10 @@ function (UPM_MIXED_MODULE_INIT)
# Set the src and hpp variables for upm_module_init # Set the src and hpp variables for upm_module_init
set (module_src ${UPM_MIXED_MODULE_INIT_CPP_SRC}) set (module_src ${UPM_MIXED_MODULE_INIT_CPP_SRC})
set (module_hpp ${UPM_MIXED_MODULE_INIT_CPP_HDR}) set (module_hpp ${UPM_MIXED_MODULE_INIT_CPP_HDR})
if(DEFINED UPM_MIXED_MODULE_INIT_IFACE_HDR)
set (module_iface ${UPM_MIXED_MODULE_INIT_IFACE_HDR})
endif(DEFINED UPM_MIXED_MODULE_INIT_IFACE_HDR)
# Reset the libname (upm_module_init can change it) # Reset the libname (upm_module_init can change it)
set (libname ${UPM_MIXED_MODULE_INIT_NAME}) set (libname ${UPM_MIXED_MODULE_INIT_NAME})
unset (IS_C_LIBRARY) unset (IS_C_LIBRARY)
@ -859,6 +863,14 @@ function(upm_module_init)
DESTINATION ${LIB_INSTALL_DIR} DESTINATION ${LIB_INSTALL_DIR}
COMPONENT ${CMAKE_PROJECT_NAME}) COMPONENT ${CMAKE_PROJECT_NAME})
# Install interface file if it exists
if(DEFINED module_iface)
set(iface_path ${PROJECT_SOURCE_DIR}/include/interfaces)
install (FILES ${iface_path}/${module_iface}
DESTINATION include/upm/interfaces
COMPONENT ${CMAKE_PROJECT_NAME}-dev)
endif(DEFINED module_iface)
# Install header files to include/upm/ # Install header files to include/upm/
install (FILES ${module_hpp} install (FILES ${module_hpp}
DESTINATION include/upm DESTINATION include/upm

1
src/abp/CMakeLists.txt
View File

@ -5,4 +5,5 @@ upm_mixed_module_init (NAME abp
CPP_HDR abp.hpp CPP_HDR abp.hpp
CPP_SRC abp.cxx CPP_SRC abp.cxx
CPP_WRAPS_C CPP_WRAPS_C
IFACE_HDR iTemperature.hpp
REQUIRES mraa) REQUIRES mraa)

1
src/lm35/CMakeLists.txt
View File

@ -2,6 +2,7 @@ upm_mixed_module_init (NAME lm35
DESCRIPTION "Analog Temperature Sensor" DESCRIPTION "Analog Temperature Sensor"
C_HDR lm35.h C_HDR lm35.h
C_SRC lm35.c C_SRC lm35.c
IFACE_HDR iTemperature.hpp
CPP_HDR lm35.hpp CPP_HDR lm35.hpp
CPP_SRC lm35.cxx CPP_SRC lm35.cxx
FTI_SRC lm35_fti.c FTI_SRC lm35_fti.c