Raspberries/mraa
Private
Public Access
2
0
Fork 0
Code Activity

Merge branch 'spi-new' of github.com:tingleby/maa into tingleby-spi-new

Browse Source 
Conflicts:
	src/CMakeLists.txt
This commit is contained in:
Brendan Le Foll
2014-04-30 14:53:21 +01:00
parent 3f0c17eb73 e04d776c95
commit 661f7b29ec
4 changed files with 141 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/CMakeLists.txt
View File

@@ -8,6 +8,7 @@ set (maa_LIB_HEADERS
${PROJECT_SOURCE_DIR}/api/gpio.h
${PROJECT_SOURCE_DIR}/api/i2c.h
${PROJECT_SOURCE_DIR}/api/pwm.h
${PROJECT_SOURCE_DIR}/api/spi.h
${PROJECT_SOURCE_DIR}/include/smbus.h
${PROJECT_SOURCE_DIR}/include/version.h
)
@@ -25,6 +26,7 @@ set (maa_LIB_SRCS
${PROJECT_SOURCE_DIR}/src/i2c/i2c.c
${PROJECT_SOURCE_DIR}/src/i2c/smbus.c
${PROJECT_SOURCE_DIR}/src/pwm/pwm.c
${PROJECT_SOURCE_DIR}/src/spi/spi.c
# autogenerated version file
${CMAKE_CURRENT_BINARY_DIR}/version.c
)