From 8784bb2ce3d600614f11f01936ae1eb3815fa011 Mon Sep 17 00:00:00 2001 From: Christian Burger Date: Sat, 28 May 2022 13:19:16 +0200 Subject: [PATCH] distributed files to `src/` directory --- CMakeLists.txt | 14 ++++++++++---- include/kNCurses/README.md | 4 ++++ Debug.cpp => src/krikkel/Debug.cpp | 0 Debug.hpp => src/krikkel/Debug.hpp | 0 DemoApp.cpp => src/krikkel/NCurses/DemoApp.cpp | 2 +- DemoApp.hpp => src/krikkel/NCurses/DemoApp.hpp | 0 .../NCurses/HorizontalTilingWindowManager.cpp | 2 +- PtyWindow.cpp => src/krikkel/NCurses/PtyWindow.cpp | 2 +- .../krikkel/NCurses/SingleUserInput.cpp | 2 +- .../krikkel/NCurses/TilingWindowManager.cpp | 2 +- .../NCurses/VerticalTilingWindowManager.cpp | 2 +- Window.cpp => src/krikkel/NCurses/Window.cpp | 0 main.cpp => src/krikkel/NCurses/main.cpp | 0 13 files changed, 20 insertions(+), 10 deletions(-) create mode 100644 include/kNCurses/README.md rename Debug.cpp => src/krikkel/Debug.cpp (100%) rename Debug.hpp => src/krikkel/Debug.hpp (100%) rename DemoApp.cpp => src/krikkel/NCurses/DemoApp.cpp (99%) rename DemoApp.hpp => src/krikkel/NCurses/DemoApp.hpp (100%) rename HorizontalTilingWindowManager.cpp => src/krikkel/NCurses/HorizontalTilingWindowManager.cpp (98%) rename PtyWindow.cpp => src/krikkel/NCurses/PtyWindow.cpp (99%) rename SingleUserInput.cpp => src/krikkel/NCurses/SingleUserInput.cpp (99%) rename TilingWindowManager.cpp => src/krikkel/NCurses/TilingWindowManager.cpp (99%) rename VerticalTilingWindowManager.cpp => src/krikkel/NCurses/VerticalTilingWindowManager.cpp (97%) rename Window.cpp => src/krikkel/NCurses/Window.cpp (100%) rename main.cpp => src/krikkel/NCurses/main.cpp (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6633437..6bbdf0d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,9 +13,14 @@ set(CMAKE_CXX_STANDARD 17) include(CTest) enable_testing() -add_library(kNCurses Window.cpp PtyWindow.cpp SingleUserInput.cpp Debug.cpp - TilingWindowManager.cpp VerticalTilingWindowManager.cpp - HorizontalTilingWindowManager.cpp) +add_library(kNCurses src/krikkel/NCurses/Window.cpp + src/krikkel/NCurses/PtyWindow.cpp + src/krikkel/NCurses/SingleUserInput.cpp + src/krikkel/NCurses/TilingWindowManager.cpp + src/krikkel/NCurses/VerticalTilingWindowManager.cpp + src/krikkel/NCurses/HorizontalTilingWindowManager.cpp + src/krikkel/Debug.cpp + ) ### let's be annoyingly pedantic target_compile_options(kNCurses PRIVATE "-Wall" "-Wextra" "-Werror" "-pedantic") @@ -44,7 +49,8 @@ find_package(Threads REQUIRED) target_link_libraries(kNCurses Threads::Threads) ### demo application -add_executable(kNCursesDemoApp main.cpp DemoApp.cpp) +add_executable(kNCursesDemoApp src/krikkel/NCurses/main.cpp + src/krikkel/NCurses/DemoApp.cpp) target_compile_options(kNCursesDemoApp PRIVATE "-Wall" "-Wextra" "-Werror" "-pedantic") target_link_libraries(kNCursesDemoApp kNCurses) diff --git a/include/kNCurses/README.md b/include/kNCurses/README.md new file mode 100644 index 0000000..efe4245 --- /dev/null +++ b/include/kNCurses/README.md @@ -0,0 +1,4 @@ +## Rational + +The include files are part of the exposed part of the library. Thus they are +kept separate from the actual source. \ No newline at end of file diff --git a/Debug.cpp b/src/krikkel/Debug.cpp similarity index 100% rename from Debug.cpp rename to src/krikkel/Debug.cpp diff --git a/Debug.hpp b/src/krikkel/Debug.hpp similarity index 100% rename from Debug.hpp rename to src/krikkel/Debug.hpp diff --git a/DemoApp.cpp b/src/krikkel/NCurses/DemoApp.cpp similarity index 99% rename from DemoApp.cpp rename to src/krikkel/NCurses/DemoApp.cpp index e179679..41954ab 100644 --- a/DemoApp.cpp +++ b/src/krikkel/NCurses/DemoApp.cpp @@ -7,7 +7,7 @@ #include "kNCurses/HorizontalTilingWindowManager.hpp" #include "kNCurses/Window.hpp" #include "kNCurses/PtyWindow.hpp" -#include "Debug.hpp" +#include "../Debug.hpp" #include #include diff --git a/DemoApp.hpp b/src/krikkel/NCurses/DemoApp.hpp similarity index 100% rename from DemoApp.hpp rename to src/krikkel/NCurses/DemoApp.hpp diff --git a/HorizontalTilingWindowManager.cpp b/src/krikkel/NCurses/HorizontalTilingWindowManager.cpp similarity index 98% rename from HorizontalTilingWindowManager.cpp rename to src/krikkel/NCurses/HorizontalTilingWindowManager.cpp index 40b475d..6a1be29 100644 --- a/HorizontalTilingWindowManager.cpp +++ b/src/krikkel/NCurses/HorizontalTilingWindowManager.cpp @@ -4,7 +4,7 @@ #include "kNCurses/HorizontalTilingWindowManager.hpp" #include "kNCurses/Window.hpp" -#include "Debug.hpp" +#include "../Debug.hpp" #include #include diff --git a/PtyWindow.cpp b/src/krikkel/NCurses/PtyWindow.cpp similarity index 99% rename from PtyWindow.cpp rename to src/krikkel/NCurses/PtyWindow.cpp index 75d1b34..f0dc303 100644 --- a/PtyWindow.cpp +++ b/src/krikkel/NCurses/PtyWindow.cpp @@ -3,7 +3,7 @@ */ #include "kNCurses/PtyWindow.hpp" -#include "Debug.hpp" +#include "../Debug.hpp" #include #include diff --git a/SingleUserInput.cpp b/src/krikkel/NCurses/SingleUserInput.cpp similarity index 99% rename from SingleUserInput.cpp rename to src/krikkel/NCurses/SingleUserInput.cpp index 1773cc6..911d19e 100644 --- a/SingleUserInput.cpp +++ b/src/krikkel/NCurses/SingleUserInput.cpp @@ -3,7 +3,7 @@ */ #include "kNCurses/SingleUserInput.hpp" -#include "Debug.hpp" +#include "../Debug.hpp" #include diff --git a/TilingWindowManager.cpp b/src/krikkel/NCurses/TilingWindowManager.cpp similarity index 99% rename from TilingWindowManager.cpp rename to src/krikkel/NCurses/TilingWindowManager.cpp index 0206326..df8f5d9 100644 --- a/TilingWindowManager.cpp +++ b/src/krikkel/NCurses/TilingWindowManager.cpp @@ -4,7 +4,7 @@ #include "kNCurses/TilingWindowManager.hpp" #include "kNCurses/Window.hpp" -#include "Debug.hpp" +#include "../Debug.hpp" #include #include diff --git a/VerticalTilingWindowManager.cpp b/src/krikkel/NCurses/VerticalTilingWindowManager.cpp similarity index 97% rename from VerticalTilingWindowManager.cpp rename to src/krikkel/NCurses/VerticalTilingWindowManager.cpp index f955112..eb3ae8f 100644 --- a/VerticalTilingWindowManager.cpp +++ b/src/krikkel/NCurses/VerticalTilingWindowManager.cpp @@ -4,7 +4,7 @@ #include "kNCurses/VerticalTilingWindowManager.hpp" #include "kNCurses/Window.hpp" -#include "Debug.hpp" +#include "../Debug.hpp" #include #include diff --git a/Window.cpp b/src/krikkel/NCurses/Window.cpp similarity index 100% rename from Window.cpp rename to src/krikkel/NCurses/Window.cpp diff --git a/main.cpp b/src/krikkel/NCurses/main.cpp similarity index 100% rename from main.cpp rename to src/krikkel/NCurses/main.cpp