From 567651f687d71a51eff23802d4f37d89158fa41d Mon Sep 17 00:00:00 2001 From: Anselme Date: Mon, 18 Jul 2016 15:09:08 +0200 Subject: [PATCH] fixed test main being included in the library --- CMakeLists.txt | 5 +++-- src/{ => test}/main.cpp | 18 +++++++++--------- 2 files changed, 12 insertions(+), 11 deletions(-) rename src/{ => test}/main.cpp (89%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7a0c7e2..53b00c7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,11 +4,12 @@ cmake_minimum_required(VERSION 2.8) SET(VERSION_MAJOR 0) SET(VERSION_MINOR 1) +set(EXTRA_INCLUDES ${PROJECT_SOURCE_DIR}/src) + # choose source file file(GLOB LIB_SRC_LIST src/*.cpp src/tools/*.cpp) file(GLOB LIB_HEAD_LIST src/*.h src/tools/*.h) -list(REMOVE_ITEM LIB_SRC_LIST src/main.cpp) -set(EXEC_SRC_LIST src/main.cpp) +set(EXEC_SRC_LIST src/test/main.cpp) #set compilation option set(IS_LIBRARY True) diff --git a/src/main.cpp b/src/test/main.cpp similarity index 89% rename from src/main.cpp rename to src/test/main.cpp index 42941de..763880c 100644 --- a/src/main.cpp +++ b/src/test/main.cpp @@ -1,20 +1,20 @@ -#include "engine.h" +#include #include #include #include #include #include -#include "resourcemanager.h" -#include "sparrowrenderer.h" -#include "scenetree.h" +#include +#include +#include -#include "tools/graph.h" -#include "tools/pathfinder.h" -#include "tools/loader.h" +#include +#include +#include -#include "tools/font.h" +#include -#include "sparrowshell.h" +#include int main(){ Engine engine;