Skip to content
This repository was archived by the owner on May 6, 2021. It is now read-only.

Commit b739eba

Browse files
committed
Added tinkerforge as local dependency
1 parent 517a1ff commit b739eba

File tree

12 files changed

+3388
-160
lines changed

12 files changed

+3388
-160
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
/*.user
22
/build
33
/build-x86
4+
.DS_Store
5+

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ find_package(libusb-1.0 REQUIRED)
6666
find_package(Threads REQUIRED)
6767

6868
if (ENABLE_TINKERFORGE)
69-
find_package(libtinkerforge-1.0 REQUIRED)
69+
#find_package(libtinkerforge-1.0 REQUIRED)
7070
endif (ENABLE_TINKERFORGE)
7171

7272
include(${QT_USE_FILE})

cmake/Findlibtinkerforge-1.0.cmake

Lines changed: 0 additions & 96 deletions
This file was deleted.

dependencies/build/CMakeLists.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11

2-
add_subdirectory(jsoncpp)
32
add_subdirectory(getoptPlusPlus)
4-
add_subdirectory(serial)
53
add_subdirectory(hidapi)
4+
add_subdirectory(jsoncpp)
5+
add_subdirectory(serial)
6+
add_subdirectory(tinkerforge)
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
project(tinkerforge)
2+
3+
# define the current source/header path
4+
set(CURRENT_HEADER_DIR ${CMAKE_SOURCE_DIR}/dependencies/include/tinkerforge)
5+
set(CURRENT_SOURCE_DIR ${CMAKE_SOURCE_DIR}/dependencies/build/tinkerforge)
6+
7+
include_directories(${CURRENT_HEADER_DIR})
8+
9+
add_library(tinkerforge
10+
${CURRENT_HEADER_DIR}/bricklet_led_strip.h
11+
${CURRENT_HEADER_DIR}/ip_connection.h
12+
13+
${CURRENT_SOURCE_DIR}/bricklet_led_strip.c
14+
${CURRENT_SOURCE_DIR}/ip_connection.c)

0 commit comments

Comments
 (0)