From a94b82b071ba4421fc6d53fdeebb63950f7b696e Mon Sep 17 00:00:00 2001 From: Neeflix Date: Thu, 7 Jun 2018 21:24:52 +0200 Subject: [PATCH 1/2] added cmakelists --- FlippR-Driver/CMakeLists.txt | 3 +++ FlippR-Driver/build/CMakeLists.txt | 8 ++++++-- FlippR-Driver/src/CMakeLists.txt | 3 +++ FlippR-Driver/src/input/CMakeLists.txt | 0 4 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 FlippR-Driver/CMakeLists.txt create mode 100644 FlippR-Driver/src/CMakeLists.txt create mode 100644 FlippR-Driver/src/input/CMakeLists.txt 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 90fda02..6694258 100644 --- a/FlippR-Driver/build/CMakeLists.txt +++ b/FlippR-Driver/build/CMakeLists.txt @@ -1,20 +1,24 @@ cmake_minimum_required(VERSION 3.9.1) project(flippr-driver) + set(CMAKE_BUILD_TYPE Debug) +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}) find_package(Threads) -include_directories(input) +include_directories(../src/input) include_directories(output) include_directories(lib) include_directories(tests) file(GLOB SOURCES "../src/*/*.cpp") -add_library(flippr_driver STATIC ${SOURCES}) +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 From f1ddeb39e66fb82067236d6eb41fb7ee7db8ff8e Mon Sep 17 00:00:00 2001 From: Neeflix Date: Thu, 7 Jun 2018 21:25:31 +0200 Subject: [PATCH 2/2] added cmakelists --- FlippR-Driver/.cproject | 384 ++++++++++------------------- FlippR-Driver/build/CMakeLists.txt | 4 +- 2 files changed, 131 insertions(+), 257 deletions(-) diff --git a/FlippR-Driver/.cproject b/FlippR-Driver/.cproject index 4d4690b..346a061 100644 --- a/FlippR-Driver/.cproject +++ b/FlippR-Driver/.cproject @@ -1,258 +1,132 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/FlippR-Driver/build/CMakeLists.txt b/FlippR-Driver/build/CMakeLists.txt index 6694258..aafcb0d 100644 --- a/FlippR-Driver/build/CMakeLists.txt +++ b/FlippR-Driver/build/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.9.1) -project(flippr-driver) + project(flippr-driver) set(CMAKE_BUILD_TYPE Debug) @@ -16,7 +16,7 @@ include_directories(output) include_directories(lib) include_directories(tests) -file(GLOB SOURCES "../src/*/*.cpp") +file(GLOB SOURCES "src/*/*.cpp") add_library(flippr_driver STATIC ${SOURCES})