Merge branch 'master' of github.com:ykiveish/upm into ykiveish-master

Signed-off-by: Brendan Le Foll <brendan.le.foll@intel.com>
Conflicts:
	examples/CMakeLists.txt
	src/CMakeLists.txt
	src/hcsr04/CMakeLists.txt
	src/servo/CMakeLists.txt

diff --cc src/lcd/CMakeLists.txt
index ecd5f67,113d91f..33ca1de
--- 1/src/lcd/CMakeLists.txt
--- 2/src/lcd/CMakeLists.txt
+++ b/src/lcd/CMakeLists.txt
@@@ -1,10 -1,4 +1,10 @@@
  set (libname "i2clcd")
- add_library (i2clcd SHARED iiclcd.cxx lcm1602.cxx jhd1313m1.cxx)
+ add_library (i2clcd SHARED iiclcd.cxx lcm1602.cxx jhd1313m1.cxx ssd1308.cxx ssd1327.cxx)
  include_directories (${MAA_INCLUDE_DIR})
  target_link_libraries (i2clcd ${MAA_LIBRARIES})
 +
 +install (TARGETS ${libname} DESTINATION lib/upm COMPONENT ${libname})
 +install (FILES iiclcd.h DESTINATION include/upm COMPONENT ${libname})
 +
 +cpack_add_component (${libname} DISPLAY_NAME ${libname} REQUIRED INSTALL_TYPES all)
 +set(CPACK_COMPONENT_${libname}_DESCRIPTION "libupm lcd")