From aa812cefda4989ed7efaa81295bc830ccd3fe56f Mon Sep 17 00:00:00 2001 From: Denes Matetelki Date: Tue, 9 Jul 2013 23:50:13 +0200 Subject: [PATCH] file restructures to be mergeable with project-seed --- CMakeLists.txt | 27 +++------------------ graph.hpp => lib/graph/graph.hpp | 0 test/CMakeLists.txt | 17 +++++++++++++ test_graph.hpp => test/graph/test_graph.hpp | 0 4 files changed, 20 insertions(+), 24 deletions(-) rename graph.hpp => lib/graph/graph.hpp (100%) create mode 100644 test/CMakeLists.txt rename test_graph.hpp => test/graph/test_graph.hpp (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6a19dad..8903062 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,28 +1,7 @@ cmake_minimum_required (VERSION 2.6) +project (PROJECT_GRAPH) -project(graph) - - +set(CMAKE_CXX_FLAGS " -Wall -Wextra -pedantic -Weffc++ -Wshadow --std=c++0x -ggdb") set(CMAKE_CXX_COMPILER "/usr/lib/colorgcc/bin/g++") -# set(CMAKE_CXX_COMPILER "/usr/bin/clang") - -set (CXX_FLAGS "-Wall -Wextra -pedantic -Weffc++ -Wshadow -ggdb -std=c++0x") -add_definitions( ${CXX_FLAGS} ) - - -find_package(CxxTest) -if(CXXTEST_FOUND) - - include_directories(${CXXTEST_INCLUDE_DIR} - ../lib) - - enable_testing() - - CXXTEST_ADD_TEST( - test_graph - generated_main.cpp - - test_graph.hpp - ) -endif() +add_subdirectory (test) diff --git a/graph.hpp b/lib/graph/graph.hpp similarity index 100% rename from graph.hpp rename to lib/graph/graph.hpp diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt new file mode 100644 index 0000000..29095af --- /dev/null +++ b/test/CMakeLists.txt @@ -0,0 +1,17 @@ +find_package(CxxTest) +if(CXXTEST_FOUND) + + include_directories(${CXXTEST_INCLUDE_DIR} + ../lib) + + enable_testing() + + CXXTEST_ADD_TEST(test_graph + generated_main.cpp + graph/test_graph.hpp) + +endif() + +add_custom_target( test + COMMAND ./test_graph +) \ No newline at end of file diff --git a/test_graph.hpp b/test/graph/test_graph.hpp similarity index 100% rename from test_graph.hpp rename to test/graph/test_graph.hpp