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

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

Browse Source 
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
This commit is contained in:
Brendan Le Foll
2014-06-06 15:14:34 +01:00
parent 794eb19bd7 557f63edf6
commit 3ee752b297
17 changed files with 1097 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/lcd/CMakeLists.txt
View File

@ -1,5 +1,5 @@
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})