Merge branch 'master' into up_stream

CMakeLists.txt

@@ -0,0 +1,7 @@
+cmake_minimum_required(VERSION 2.8)
+project(WiringPi_lib)
+
+add_subdirectory(devLib)
+add_subdirectory(gpio)
+#add_subdirectory(pins)
+add_subdirectory(wiringPi)

README.md

@@ -0,0 +1,39 @@
+wiringPi README
+===============
+
+Please note that the official way to get wiringPi is via git from
+git.drogon.net and not GitHub.
+
+ie.
+
+  git clone git://git.drogon.net/wiringPi
+
+   
+
+The version of wiringPi held on GitHub by "Gadgetoid" is used to build the
+wiringPython, Ruby, Perl, etc. wrappers for these other languages. This
+version may lag the official Drogon release.  Pull requests may not be
+accepted to Github....
+
+Please see
+
+  http://wiringpi.com/
+
+for the official documentation, etc. and the best way to submit bug reports, etc.
+is by sending an email to projects@drogon.net
+
+Thanks!
+
+  -Gordon
+
+
+   同步  git://git.drogon.net/wiringPi 最新源代码到项目当中。
+     此修改基于 原来的master 分支  
+
+   `   git remote add upstream git://git.drogon.net/wiringPi  `
+
+   `    git fetch upstream master:upstream/master  `
+
+   `     git merge upstream/master     `
+
+   `     git push origin master:master  `

devLib/CMakeLists.txt

@@ -0,0 +1,15 @@
+set(devLib_src ds1302.c maxdetect.c scrollPhat.c piNes.c gertboard.c piFace.c lcd128x64.c lcd.c piGlow.c)
+set(LIB_INSTALL_PATH /usr/lib)
+set(LIB_INSTALL_HEADERS_PATH /usr/local)
+add_library(libwiringPiDev  SHARED ${devLib_src})
+set(LIBRARY_OUTPUT_PATH {LIB_INSTALL_PATH)
+add_definitions("-lpthread")
+set_target_properties(libwiringPiDev PROPERTIES OUTPUT_NAME "wiringPiDev")
+set(root_HEADERS 
+    ds1302.h gertboard.h lcd.h 
+    lcd128x64.h maxdetect.h piFace.h
+    piGlow.h piNes.h scrollPhat.h scrollPhatFont.h)
+install(FILES ${root_HEADERS} DESTINATION ${LIB_INSTALL_HEADERS_PATH}/include)
+install(TARGETS libwiringPiDev DESTINATION ${LIB_INSTALL_PATH})
+
+

gpio/CMakeLists.txt

@@ -0,0 +1,11 @@
+include_directories(${PROJECT_SOURCE_DIR}/devLib)
+include_directories(${PROJECT_SOURCE_DIR}/wiringPi)
+#project(gpio)
+set(GPIO_SRC gpio.c readall.c pins.c)
+set(GPIO_BINARY_PATH /usr/bin)
+add_executable(gpio ${GPIO_SRC})
+target_link_libraries(gpio libwiringPi libwiringPiDev -lpthread -lm)
+set(EXECUTABLE_OUTPUT_PATH ${GPIO_BINARY_PATH})
+install(TARGETS gpio 
+             RUNTIME DESTINATION bin)
+

wiringPi/CMakeLists.txt

@@ -0,0 +1,34 @@
+set(wiringPi_src wiringPi.c						
+		wiringSerial.c wiringShift.c				
+		piHiPri.c piThread.c					
+		wiringPiSPI.c wiringPiI2C.c
+		softPwm.c softTone.c ads1115.c				
+		mcp23008.c mcp23016.c mcp23017.c			
+		mcp23s08.c mcp23s17.c sr595.c												
+		pcf8574.c pcf8591.c sn3218.c					
+		mcp3002.c mcp3004.c mcp4802.c mcp3422.c
+		max31855.c max5322.c drcSerial.c							
+		wpiExtensions.c)
+set(LIB_INSTALL_PATH /usr/lib)
+set(LIB_INSTALL_HEADERS_PATH /usr/local)
+add_library(libwiringPi  SHARED ${wiringPi_src})
+set(LIBRARY_OUTPUT_PATH {LIB_INSTALL_PATH)
+add_definitions("-lpthread")
+set_target_properties(libwiringPi PROPERTIES OUTPUT_NAME "wiringPi")
+
+set(root_HEADERS 
+                wiringPi.h						
+		wiringSerial.h wiringShift.h				
+		wiringPiSPI.h wiringPiI2C.h				
+		softPwm.h softTone.h				
+		mcp23008.h mcp23016.h mcp23017.h			
+		mcp23s08.h mcp23s17.h				
+		sr595.h	ads1115.h					
+		pcf8574.h pcf8591.h				
+		mcp3002.h mcp3004.h mcp4802.h mcp3422.h			
+		max31855.h max5322.h					
+		sn3218.h drcSerial.h											
+		wpiExtensions.h)
+
+install(FILES ${root_HEADERS} DESTINATION ${LIB_INSTALL_HEADERS_PATH}/include)
+install(TARGETS libwiringPi DESTINATION ${LIB_INSTALL_PATH})