From bb82ff8317ab41c9a85cb1a95babe7796605c228 Mon Sep 17 00:00:00 2001 From: Michael Mandl Date: Thu, 19 Oct 2017 13:57:55 +0200 Subject: [PATCH 1/6] Moved rc-switch to sub-project --- .gitmodules | 4 ++-- source/CMakeLists.txt | 7 ++----- source/RCSwitch/CMakeLists.txt | 11 +++++++++++ source/{ => RCSwitch}/rc-switch | 0 4 files changed, 15 insertions(+), 7 deletions(-) create mode 100644 source/RCSwitch/CMakeLists.txt rename source/{ => RCSwitch}/rc-switch (100%) diff --git a/.gitmodules b/.gitmodules index 9e20115..af5f9df 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ -[submodule "source/rc-switch"] - path = source/rc-switch +[submodule "source/RCSwitch/rc-switch"] + path = source/RCSwitch/rc-switch url = git@github.com:sui77/rc-switch.git diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index 8a3b261..20fa876 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -9,11 +9,6 @@ set(CMAKE_AUTOUIC ON) add_definitions(-DRPI) -add_library(rc-switch - rc-switch/RCSwitch.cpp - rc-switch/RCSwitch.h -) - add_executable(qSniff qsniff.cpp mainwindow.cpp @@ -35,3 +30,5 @@ add_executable(Sniff target_link_libraries(Sniff rc-switch wiringPi) +add_subdirectory(RCSwitch) + diff --git a/source/RCSwitch/CMakeLists.txt b/source/RCSwitch/CMakeLists.txt new file mode 100644 index 0000000..ae85280 --- /dev/null +++ b/source/RCSwitch/CMakeLists.txt @@ -0,0 +1,11 @@ +cmake_minimum_required(VERSION 3.6) + +add_library(rc-switch + rc-switch/RCSwitch.cpp + rc-switch/RCSwitch.h +) + +target_include_directories(rc-switch + PUBLIC . +) + diff --git a/source/rc-switch b/source/RCSwitch/rc-switch similarity index 100% rename from source/rc-switch rename to source/RCSwitch/rc-switch From 1d2084a0174405d9de44a40ceaf12bf35a62759e Mon Sep 17 00:00:00 2001 From: Michael Mandl Date: Thu, 19 Oct 2017 14:10:00 +0200 Subject: [PATCH 2/6] Moved sniffer to separate sub-project --- source/CMakeLists.txt | 18 ++++++++++++------ source/sniffer/CMakeLists.txt | 16 ++++++++++++++++ source/{ => sniffer}/sniffer.cpp | 0 source/{ => sniffer}/sniffer.h | 0 4 files changed, 28 insertions(+), 6 deletions(-) create mode 100644 source/sniffer/CMakeLists.txt rename source/{ => sniffer}/sniffer.cpp (100%) rename source/{ => sniffer}/sniffer.h (100%) diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index 20fa876..e63255e 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -16,19 +16,25 @@ add_executable(qSniff mainwindow.ui sniffthread.cpp sniffthread.h - sniffer.cpp - sniffer.h ) -target_link_libraries(qSniff rc-switch wiringPi Qt5::Widgets) +target_link_libraries(qSniff + sniffer + rc-switch + wiringPi + Qt5::Widgets +) add_executable(Sniff sniff.cpp - sniffer.cpp - sniffer.h ) -target_link_libraries(Sniff rc-switch wiringPi) +target_link_libraries(Sniff + sniffer + rc-switch + wiringPi +) add_subdirectory(RCSwitch) +add_subdirectory(sniffer) diff --git a/source/sniffer/CMakeLists.txt b/source/sniffer/CMakeLists.txt new file mode 100644 index 0000000..4cca14a --- /dev/null +++ b/source/sniffer/CMakeLists.txt @@ -0,0 +1,16 @@ +project(sniffer) +cmake_minimum_required(VERSION 3.6) + +add_library(${PROJECT_NAME} + sniffer.cpp + sniffer.h +) + +target_link_libraries(${PROJECT_NAME} + rc-switch +) + +target_include_directories(${PROJECT_NAME} + PUBLIC . +) + diff --git a/source/sniffer.cpp b/source/sniffer/sniffer.cpp similarity index 100% rename from source/sniffer.cpp rename to source/sniffer/sniffer.cpp diff --git a/source/sniffer.h b/source/sniffer/sniffer.h similarity index 100% rename from source/sniffer.h rename to source/sniffer/sniffer.h From fa85202c3d33ddf534629b1288e9ce20bbe5b282 Mon Sep 17 00:00:00 2001 From: Michael Mandl Date: Thu, 19 Oct 2017 14:29:03 +0200 Subject: [PATCH 3/6] Moved qsniff to separate sub-project --- source/CMakeLists.txt | 22 +--------------------- source/RCSwitch/CMakeLists.txt | 9 +++++++-- source/qsniff/CMakeLists.txt | 24 ++++++++++++++++++++++++ source/{ => qsniff}/mainwindow.cpp | 0 source/{ => qsniff}/mainwindow.h | 0 source/{ => qsniff}/mainwindow.ui | 0 source/{ => qsniff}/qsniff.cpp | 0 source/{ => qsniff}/sniffthread.cpp | 0 source/{ => qsniff}/sniffthread.h | 0 9 files changed, 32 insertions(+), 23 deletions(-) create mode 100644 source/qsniff/CMakeLists.txt rename source/{ => qsniff}/mainwindow.cpp (100%) rename source/{ => qsniff}/mainwindow.h (100%) rename source/{ => qsniff}/mainwindow.ui (100%) rename source/{ => qsniff}/qsniff.cpp (100%) rename source/{ => qsniff}/sniffthread.cpp (100%) rename source/{ => qsniff}/sniffthread.h (100%) diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index e63255e..3b2c5fe 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -1,30 +1,9 @@ cmake_minimum_required(VERSION 3.6) -find_package(Qt5Widgets) - set(CMAKE_CXX_STANDARD 11) -set(CMAKE_INCLUDE_CURRENT_DIR ON) -set(CMAKE_AUTOMOC ON) -set(CMAKE_AUTOUIC ON) add_definitions(-DRPI) -add_executable(qSniff - qsniff.cpp - mainwindow.cpp - mainwindow.h - mainwindow.ui - sniffthread.cpp - sniffthread.h -) - -target_link_libraries(qSniff - sniffer - rc-switch - wiringPi - Qt5::Widgets -) - add_executable(Sniff sniff.cpp ) @@ -37,4 +16,5 @@ target_link_libraries(Sniff add_subdirectory(RCSwitch) add_subdirectory(sniffer) +add_subdirectory(qsniff) diff --git a/source/RCSwitch/CMakeLists.txt b/source/RCSwitch/CMakeLists.txt index ae85280..0834e87 100644 --- a/source/RCSwitch/CMakeLists.txt +++ b/source/RCSwitch/CMakeLists.txt @@ -1,11 +1,16 @@ +project(rc-switch) cmake_minimum_required(VERSION 3.6) -add_library(rc-switch +add_library(${PROJECT_NAME} rc-switch/RCSwitch.cpp rc-switch/RCSwitch.h ) -target_include_directories(rc-switch +target_link_libraries(${PROJECT_NAME} + wiringPi +) + +target_include_directories(${PROJECT_NAME} PUBLIC . ) diff --git a/source/qsniff/CMakeLists.txt b/source/qsniff/CMakeLists.txt new file mode 100644 index 0000000..dfeb3ab --- /dev/null +++ b/source/qsniff/CMakeLists.txt @@ -0,0 +1,24 @@ +project(qSniff) +cmake_minimum_required(VERSION 3.6) + +find_package(Qt5Widgets) + +set(CMAKE_CXX_STANDARD 11) +set(CMAKE_INCLUDE_CURRENT_DIR ON) +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTOUIC ON) + +add_executable(${PROJECT_NAME} + qsniff.cpp + mainwindow.cpp + mainwindow.h + mainwindow.ui + sniffthread.cpp + sniffthread.h +) + +target_link_libraries(${PROJECT_NAME} + sniffer + Qt5::Widgets +) + diff --git a/source/mainwindow.cpp b/source/qsniff/mainwindow.cpp similarity index 100% rename from source/mainwindow.cpp rename to source/qsniff/mainwindow.cpp diff --git a/source/mainwindow.h b/source/qsniff/mainwindow.h similarity index 100% rename from source/mainwindow.h rename to source/qsniff/mainwindow.h diff --git a/source/mainwindow.ui b/source/qsniff/mainwindow.ui similarity index 100% rename from source/mainwindow.ui rename to source/qsniff/mainwindow.ui diff --git a/source/qsniff.cpp b/source/qsniff/qsniff.cpp similarity index 100% rename from source/qsniff.cpp rename to source/qsniff/qsniff.cpp diff --git a/source/sniffthread.cpp b/source/qsniff/sniffthread.cpp similarity index 100% rename from source/sniffthread.cpp rename to source/qsniff/sniffthread.cpp diff --git a/source/sniffthread.h b/source/qsniff/sniffthread.h similarity index 100% rename from source/sniffthread.h rename to source/qsniff/sniffthread.h From 35d34283215e273e9160bdaf27e58a57536e4d1c Mon Sep 17 00:00:00 2001 From: Michael Mandl Date: Thu, 19 Oct 2017 16:45:24 +0200 Subject: [PATCH 4/6] Moved sniff to separate sub-project --- source/CMakeLists.txt | 11 +---------- source/sniff/CMakeLists.txt | 13 +++++++++++++ source/{ => sniff}/sniff.cpp | 0 3 files changed, 14 insertions(+), 10 deletions(-) create mode 100644 source/sniff/CMakeLists.txt rename source/{ => sniff}/sniff.cpp (100%) diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index 3b2c5fe..bfb2af0 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -4,17 +4,8 @@ set(CMAKE_CXX_STANDARD 11) add_definitions(-DRPI) -add_executable(Sniff - sniff.cpp -) - -target_link_libraries(Sniff - sniffer - rc-switch - wiringPi -) - add_subdirectory(RCSwitch) add_subdirectory(sniffer) add_subdirectory(qsniff) +add_subdirectory(sniff) diff --git a/source/sniff/CMakeLists.txt b/source/sniff/CMakeLists.txt new file mode 100644 index 0000000..8d8184c --- /dev/null +++ b/source/sniff/CMakeLists.txt @@ -0,0 +1,13 @@ +project(Sniff) +cmake_minimum_required(VERSION 3.6) + +add_executable(${PROJECT_NAME} + sniff.cpp +) + +target_link_libraries(${PROJECT_NAME} + sniffer + rc-switch + wiringPi +) + diff --git a/source/sniff.cpp b/source/sniff/sniff.cpp similarity index 100% rename from source/sniff.cpp rename to source/sniff/sniff.cpp From 823ebbe42d435186bc4807e0c98ebb980d41e3ea Mon Sep 17 00:00:00 2001 From: Michael Mandl Date: Thu, 19 Oct 2017 16:56:04 +0200 Subject: [PATCH 5/6] Moved -DRPI to RCSwitch project --- source/CMakeLists.txt | 4 ---- source/RCSwitch/CMakeLists.txt | 7 ++++++- source/sniffer/sniffer.h | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index bfb2af0..482771d 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -1,9 +1,5 @@ cmake_minimum_required(VERSION 3.6) -set(CMAKE_CXX_STANDARD 11) - -add_definitions(-DRPI) - add_subdirectory(RCSwitch) add_subdirectory(sniffer) add_subdirectory(qsniff) diff --git a/source/RCSwitch/CMakeLists.txt b/source/RCSwitch/CMakeLists.txt index 0834e87..09322a5 100644 --- a/source/RCSwitch/CMakeLists.txt +++ b/source/RCSwitch/CMakeLists.txt @@ -11,6 +11,11 @@ target_link_libraries(${PROJECT_NAME} ) target_include_directories(${PROJECT_NAME} - PUBLIC . + PUBLIC rc-switch ) +target_compile_definitions(${PROJECT_NAME} + PUBLIC RPI +) + + diff --git a/source/sniffer/sniffer.h b/source/sniffer/sniffer.h index 8b2747a..16e9dc0 100644 --- a/source/sniffer/sniffer.h +++ b/source/sniffer/sniffer.h @@ -1,6 +1,6 @@ #pragma once -#include "rc-switch/RCSwitch.h" +#include "RCSwitch.h" class Sniffer { From bbd03b56bbdc3be8f441ea0cca73ad0525220d59 Mon Sep 17 00:00:00 2001 From: Michael Mandl Date: Thu, 19 Oct 2017 17:01:21 +0200 Subject: [PATCH 6/6] Added C++11 standard requirement --- source/sniff/CMakeLists.txt | 2 ++ source/sniffer/CMakeLists.txt | 2 ++ 2 files changed, 4 insertions(+) diff --git a/source/sniff/CMakeLists.txt b/source/sniff/CMakeLists.txt index 8d8184c..f0f24f7 100644 --- a/source/sniff/CMakeLists.txt +++ b/source/sniff/CMakeLists.txt @@ -1,6 +1,8 @@ project(Sniff) cmake_minimum_required(VERSION 3.6) +set(CMAKE_CXX_STANDARD 11) + add_executable(${PROJECT_NAME} sniff.cpp ) diff --git a/source/sniffer/CMakeLists.txt b/source/sniffer/CMakeLists.txt index 4cca14a..6324262 100644 --- a/source/sniffer/CMakeLists.txt +++ b/source/sniffer/CMakeLists.txt @@ -1,6 +1,8 @@ project(sniffer) cmake_minimum_required(VERSION 3.6) +set(CMAKE_CXX_STANDARD 11) + add_library(${PROJECT_NAME} sniffer.cpp sniffer.h