diff --git a/FlippR-Driver/.cproject b/FlippR-Driver/.cproject index 88205d1..b1c3aa6 100644 --- a/FlippR-Driver/.cproject +++ b/FlippR-Driver/.cproject @@ -1,5 +1,136 @@ +<<<<<<< HEAD + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +======= @@ -267,4 +398,5 @@ +>>>>>>> 1f0fd916cc2f3e7edd60b5dc45f16f825c6f06db diff --git a/FlippR-Driver/CMakeLists.txt b/FlippR-Driver/CMakeLists.txt new file mode 100644 index 0000000..46d36d9 --- /dev/null +++ b/FlippR-Driver/CMakeLists.txt @@ -0,0 +1,3 @@ +project(flippr-driver) + +subdirs(build Debug etc json_example src) diff --git a/FlippR-Driver/build/CMakeLists.txt b/FlippR-Driver/build/CMakeLists.txt index b6e8b41..d95d82c 100644 --- a/FlippR-Driver/build/CMakeLists.txt +++ b/FlippR-Driver/build/CMakeLists.txt @@ -1,8 +1,11 @@ cmake_minimum_required(VERSION 3.9.1) -project(flippr-driver) + project(flippr-driver) + set(CMAKE_BUILD_TYPE Debug) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") # enable C++11 standard +set(CMAKE_SOURCE_DIR ../src) + set(CMAKE_BINARY_DIR ${CMAKE_SOURCE_DIR}/bin) set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}) set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}) @@ -10,13 +13,21 @@ set(SOURCE_DIR ../src) find_package(Threads) +<<<<<<< HEAD +include_directories(../src/input) +include_directories(output) +include_directories(lib) +include_directories(tests) +======= include_directories(${SOURCE_DIR}/input) include_directories(${SOURCE_DIR}/output) include_directories(${SOURCE_DIR}/lib) include_directories(${SOURCE_DIR}/utilities) +>>>>>>> 1f0fd916cc2f3e7edd60b5dc45f16f825c6f06db + +file(GLOB SOURCES "src/*/*.cpp") -file(GLOB SOURCES "../src/*/*.cpp") add_library(flippr_driver STATIC ${SOURCES}) - + target_link_libraries(flippr_driver ${CMAKE_SOURCE_DIR}/lib/libwiringPi.so.2.44) diff --git a/FlippR-Driver/src/CMakeLists.txt b/FlippR-Driver/src/CMakeLists.txt new file mode 100644 index 0000000..a856a3d --- /dev/null +++ b/FlippR-Driver/src/CMakeLists.txt @@ -0,0 +1,3 @@ +project(flippr-driver) + +subdirs(bin input lib tests utilities) diff --git a/FlippR-Driver/src/input/CMakeLists.txt b/FlippR-Driver/src/input/CMakeLists.txt new file mode 100644 index 0000000..e69de29