Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes issue #19 #20

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fixes issue #19 #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b24e605
Fix build when `i2c-tools` is installed
girst Jan 27, 2017
836b62f
examples: make freetype and imagemagick optional
girst Jan 27, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions examples/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ set( EXECUTABLE_OUTPUT_PATH "build" )
find_package( RpiHw REQUIRED )

# Find some dependencies
find_package( Freetype REQUIRED )
find_package( GraphicsMagick++ REQUIRED )
find_package( Freetype )
find_package( GraphicsMagick++ )

# Set the path to the header files
include_directories( ${RpiHw_INCLUDE_DIRS} )
Expand Down
7 changes: 6 additions & 1 deletion include/rpi-hw/driver/i2c.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,13 @@
#include <unistd.h>
#include <fcntl.h>
#include <sys/ioctl.h>
#include <linux/i2c.h>
#include <linux/i2c-dev.h>
#ifndef I2C_FUNC_I2C
/* linux/i2c-dev.h provided by i2c-tools contains the symbols
* defined in linux/i2c.h. (this comment (C) github.com/ceolin/soletta)
*/
#include <linux/i2c.h>
#endif
#include <cstring>

#include <rpi-hw/rpi.hpp>
Expand Down