~ changing up a few includes

This commit is contained in:
Johannes Theiner 2020-01-08 19:19:26 +01:00
parent e6354ba2c2
commit d00402f4b6
7 changed files with 9 additions and 19 deletions

View File

@ -18,7 +18,7 @@ set(CMAKE_CXX_STANDARD 14)
set(CMAKE_CXX_CLANG_TIDY clang-tidy;-header-filter=.;) set(CMAKE_CXX_CLANG_TIDY clang-tidy;-header-filter=.;)
file(GLOB_RECURSE SOURCES src/*.cpp) file(GLOB_RECURSE SOURCES src/*.cpp)
file(GLOB_RECURSE HEADERS src/*.h) file(GLOB_RECURSE HEADERS src/*.hpp)
file(GLOB_RECURSE TESTS test/*.cpp) file(GLOB_RECURSE TESTS test/*.cpp)
include_directories(src) include_directories(src)
include_directories(test) include_directories(test)

View File

@ -1,8 +1,8 @@
#include "../src/Terminal.hpp"
#include "internal.hpp"
#include "vkvm.hpp" #include "vkvm.hpp"
#include <iostream> #include <iostream>
#include <unistd.h> #include <unistd.h>
#include "internal.hpp"
#include "../src/Terminal.h"
int main() { int main() {

View File

@ -1,10 +1,5 @@
//
// Created by yukun on 29.11.19.
//
#include <iostream> #include <iostream>
#include <vector> #include "Terminal.hpp"
#include "vkvm.hpp"
#include "Terminal.h"
std::string Terminal::getString() { std::string Terminal::getString() {
return s; return s;

View File

@ -1,11 +1,6 @@
// //
// Created by yukun on 29.11.19. #ifndef TERMINAL_TERMINAL_HPP
// #define TERMINAL_TERMINAL_HPP
#ifndef TERMINAL_TERMINAL_H
#define TERMINAL_TERMINAL_H
#include "vkvm.hpp"
class Terminal { class Terminal {
public: public:
@ -25,4 +20,4 @@ private:
int status = 0; int status = 0;
char cursor = -127; char cursor = -127;
}; };
#endif //TERMINAL_TERMINAL_H #endif //TERMINAL_TERMINAL_HPP

View File

@ -1,4 +1,4 @@
#include "demo.h" #include "demo.hpp"
int test() { int test() {
return 42; return 42;

View File

@ -1,5 +1,5 @@
#include <catch2/catch.hpp> #include <catch2/catch.hpp>
#include "../src/demo.h" #include "demo.hpp"
TEST_CASE("Demo test") { TEST_CASE("Demo test") {
REQUIRE(test() == 42); REQUIRE(test() == 42);