Reorganize code structure

mighelone · Jan 12, 2018 · 06b466d · 06b466d
1 parent 4a4efec
commit 06b466d
Show file tree

Hide file tree

Showing 17 changed files with 14 additions and 7 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2,13 +2,18 @@ cmake_minimum_required (VERSION 3.7)
 
 project (PKP)
 
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
+
 # include directories
 include_directories ("/Users/vascella/.local/include")
+include_directories ("./src")
 link_directories ("/Users/vascella/.local/lib")
 
 #set ( CMAKE_C_FLAGS "-std=gnu++11")
 # add_definitions("-std=gnu++14")
-set (CMAKE_CXX_STANDARD 11)
+set (CMAKE_CXX_STANDARD 14)
 
 # https://stackoverflow.com/questions/36078456/cmake-add-include-paths-to-clang
 # generates the file compile_commands.json.
@@ -19,24 +24,26 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wall")
 set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Wall")
 
-set(SOURCE_FILES model.cpp reactor.cpp SFOR.cpp C2SM.cpp ModelFactory.cpp)
+# set(SOURCE_FILES model.cpp reactor.cpp SFOR.cpp C2SM.cpp ModelFactory.cpp)
+# set(SOURCE_FILES src/*.cpp)
+file(GLOB project_sources src/*.cpp)
 
-add_library(pkp SHARED ${SOURCE_FILES})
+add_library(pkp SHARED ${project_sources})
 
 # test
-add_executable(test.x test.cpp)
+add_executable(test.x test/test.cpp)
 target_link_libraries(test.x pkp gtest)
 
 # test reactorT
-add_executable(test_reactorT.x test_reactorT.cpp)
+add_executable(test_reactorT.x test/test_reactorT.cpp)
 target_link_libraries(test_reactorT.x pkp gtest)
 
 # main
-add_executable(main.x main.cpp)
+add_executable(main.x test/main.cpp)
 target_link_libraries(main.x pkp yaml-cpp)
 
 # main
-add_executable(test_factory.x test_factory.cpp)
+add_executable(test_factory.x test/test_factory.cpp)
 target_link_libraries(test_factory.x pkp)
 
 #add_executable(test.x gtest.cpp)

diff --git a/C2SM.cpp → src/C2SM.cpp b/C2SM.cpp → src/C2SM.cpp
diff --git a/C2SM.hpp → src/C2SM.hpp b/C2SM.hpp → src/C2SM.hpp
diff --git a/ModelFactory.cpp → src/ModelFactory.cpp b/ModelFactory.cpp → src/ModelFactory.cpp
diff --git a/ModelFactory.hpp → src/ModelFactory.hpp b/ModelFactory.hpp → src/ModelFactory.hpp
diff --git a/SFOR.cpp → src/SFOR.cpp b/SFOR.cpp → src/SFOR.cpp
diff --git a/SFOR.hpp → src/SFOR.hpp b/SFOR.hpp → src/SFOR.hpp
diff --git a/csv.hpp → src/csv.hpp b/csv.hpp → src/csv.hpp
diff --git a/model.cpp → src/model.cpp b/model.cpp → src/model.cpp
diff --git a/model.hpp → src/model.hpp b/model.hpp → src/model.hpp
diff --git a/reactor.cpp → src/reactor.cpp b/reactor.cpp → src/reactor.cpp
diff --git a/reactor.hpp → src/reactor.hpp b/reactor.hpp → src/reactor.hpp
diff --git a/reactort.hpp → src/reactort.hpp b/reactort.hpp → src/reactort.hpp
diff --git a/main.cpp → test/main.cpp b/main.cpp → test/main.cpp
diff --git a/test.cpp → test/test.cpp b/test.cpp → test/test.cpp
diff --git a/test_factory.cpp → test/test_factory.cpp b/test_factory.cpp → test/test_factory.cpp
diff --git a/test_reactorT.cpp → test/test_reactorT.cpp b/test_reactorT.cpp → test/test_reactorT.cpp