rhetenor/flippr-code
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

commit before branching

Browse Source
This commit is contained in:
Jonas Zeunert
2018-06-07 23:55:48 +02:00
parent 6540ec6137
commit ceb677530c
3 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
FlippR-Driver/build/CMakeLists.txt
View File

@@ -23,3 +23,23 @@ file(GLOB HEADER_SOURCES ${SOURCE_DIR}/*/*.hpp")
add_library(flippr_driver STATIC ${SOURCES} ${HEADER_SOURCES}) add_library(flippr_driver STATIC ${SOURCES} ${HEADER_SOURCES})
target_link_libraries(flippr_driver ${CMAKE_SOURCE_DIR}/lib/libwiringPi.so.2.44) target_link_libraries(flippr_driver ${CMAKE_SOURCE_DIR}/lib/libwiringPi.so.2.44)
enable_testing(TRUE)
# Prepare "Catch" library for other executables
set(CATCH_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../src/tests)
add_library(Catch INTERFACE)
target_include_directories(Catch INTERFACE ${CATCH_INCLUDE_DIR}/*)
# Make test executable
set(TEST_SOURCES ${SOURCE_DIR}/../tests/input)
include_directories(${TEST_SOURCES})
include_directories(${TEST_SOURCES}/mocks)
file(GLOB SOURCES ${TEST_SOURCES}/*.cpp)
file(GLOB HEADER_SOURCES ${TEST_SOURCES}/*.hpp)
add_executable(tests ${SOURCES} ${HEADER_SOURCES})
target_link_libraries(flippr_driver)
target_link_libraries(tests Catch)

0
FlippR-Driver/json_example/gpio_config.json → FlippR-Driver/build/bak/json_example/gpio_config.json
View File

2
FlippR-Driver/src/input/InputDriver.hpp
View File

@@ -9,7 +9,7 @@
#include "../utilities/config.h" #include "../utilities/config.h"
#include "EventHandler.h" #include "EventHandler.hpp"
#include "EventNotifier.h" #include "EventNotifier.h"
#include "Detector.h" #include "Detector.h"