* working on cmake

39822222 · Paul Heinzlreiter · 334051e0 · 39822222 · 39822222 · 39822222
Commit 39822222 authored 8 years ago by Paul Heinzlreiter
--- a/bh_tree_mpi/CMakeLists.txt
+++ b/bh_tree_mpi/CMakeLists.txt
@@ -2,10 +2,13 @@ cmake_minimum_required (VERSION 2.6)
 project (bh_tree_mpi)

 find_package(MPI REQUIRED)
-include_directories(${MPI_INCLUDE_PATH})
+include_directories(${MPI_INCLUDE_PATH} datastructures simulation)
+
+add_subdirectory(datastructures)
+add_subdirectory(simulation)

 add_executable(bh_tree_mpi mpimain.cpp)
-target_link_libraries(bh_tree_mpi ${MPI_LIBRARIES})
+target_link_libraries(bh_tree_mpi datastructures simulation ${MPI_LIBRARIES})

 if(MPI_COMPILE_FLAGS)
  set_target_properties(bh_tree_mpi PROPERTIES

--- a/bh_tree_mpi/BarnesHutTree.cpp
+++ b/bh_tree_mpi/BarnesHutTree.cpp
--- a/bh_tree_mpi/BarnesHutTree.hpp
+++ b/bh_tree_mpi/BarnesHutTree.hpp
--- a/bh_tree_mpi/Body.cpp
+++ b/bh_tree_mpi/Body.cpp
--- a/bh_tree_mpi/Body.hpp
+++ b/bh_tree_mpi/Body.hpp
--- a/bh_tree_mpi/Box.cpp
+++ b/bh_tree_mpi/Box.cpp
--- a/bh_tree_mpi/Box.hpp
+++ b/bh_tree_mpi/Box.hpp
--- a/bh_tree_mpi/datastructures/CMakeLists.txt
+++ b/bh_tree_mpi/datastructures/CMakeLists.txt
+file( GLOB datastructures_SOURCES *.hpp *.cpp )
+add_library( datastructures ${datastructures_SOURCES} )
\ No newline at end of file
--- a/bh_tree_mpi/Node.cpp
+++ b/bh_tree_mpi/Node.cpp
--- a/bh_tree_mpi/Node.hpp
+++ b/bh_tree_mpi/Node.hpp
--- a/bh_tree_mpi/Tree.cpp
+++ b/bh_tree_mpi/Tree.cpp
--- a/bh_tree_mpi/Tree.hpp
+++ b/bh_tree_mpi/Tree.hpp
@@ -18,7 +18,6 @@ namespace nbody {
 		friend class Node;
 	protected:
 		Node* nodes;
-		//Control control;
 		unsigned int maxLeafBodies;
 	public:
 		static vector<Body> dubinskiParse(string filename);

--- a/bh_tree_mpi/main.cpp
+++ b/bh_tree_mpi/main.cpp
-#include "BarnesHutTree.hpp"
-#include "MpiSimulation.hpp"
+#include <BarnesHutTree.hpp>
+#include <MpiSimulation.hpp>
 #include <iostream>
 #include <mpi.h>


--- a/bh_tree_mpi/mpimain.cpp
+++ b/bh_tree_mpi/mpimain.cpp
-#include "BarnesHutTree.hpp"
-#include "MpiSimulation.hpp"
+#include <BarnesHutTree.hpp>
+#include <MpiSimulation.hpp>
 #include <iostream>
 #include <mpi.h>


--- a/bh_tree_mpi/simulation/CMakeLists.txt
+++ b/bh_tree_mpi/simulation/CMakeLists.txt
+file( GLOB simulation_SOURCES *.hpp *.cpp )
+include_directories(../datastructures)
+add_library( simulation ${simulation_SOURCES} )
\ No newline at end of file
--- a/bh_tree_mpi/MpiBodyComm.cpp
+++ b/bh_tree_mpi/MpiBodyComm.cpp
--- a/bh_tree_mpi/MpiBodyComm.hpp
+++ b/bh_tree_mpi/MpiBodyComm.hpp
@@ -4,7 +4,7 @@

 #include <mpi.h>
 #include <vector>
-#include "Body.hpp"
+#include <Body.hpp>

 namespace nbody {
 	using namespace std;

--- a/bh_tree_mpi/MpiSimulation.cpp
+++ b/bh_tree_mpi/MpiSimulation.cpp
 #include <iostream>
 #include <cmath>
-#include "Body.hpp"
-#include "Box.hpp"
+#include <Body.hpp>
+#include <Box.hpp>
+#include <Tree.hpp>
+#include <Node.hpp>
 #include "MpiSimulation.hpp"
-#include "Tree.hpp"
-#include "Node.hpp"

 namespace nbody {
 	using namespace std;

--- a/bh_tree_mpi/MpiSimulation.hpp
+++ b/bh_tree_mpi/MpiSimulation.hpp
--- a/bh_tree_mpi/PthreadSimulation.cpp
+++ b/bh_tree_mpi/PthreadSimulation.cpp