From bb82ff8317ab41c9a85cb1a95babe7796605c228 Mon Sep 17 00:00:00 2001 From: Michael Mandl Date: Thu, 19 Oct 2017 13:57:55 +0200 Subject: [PATCH] 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