Fixed paths for python bindings

stormpy/CMakeLists.txt

@@ -17,8 +17,8 @@ foreach(arg ${STORMPY_INCLUDE_DIRS_PROP})
     set(sep ":")
 endforeach()
 set(STORMPY_COMPILE_ARGS ${CMAKE_CXX_FLAGS})
-set(STORMPY_LIBRARY_DIRS "${PROJECT_BINARY_DIR}/src")
-set(STORMPY_RPATH "${PROJECT_BINARY_DIR}/src")
+set(STORMPY_LIBRARY_DIRS "${PROJECT_BINARY_DIR}/src/storm")
+set(STORMPY_RPATH "${PROJECT_BINARY_DIR}/src/storm")
 configure_file (
     "${PROJECT_SOURCE_DIR}/stormpy/setup.cfg.in"
     "${PROJECT_SOURCE_DIR}/stormpy/setup.cfg"

stormpy/src/core/common.h

@@ -1,4 +1,3 @@
 #include "src/common.h"
+#include "storm/utility/storm.h"
 #include <pybind11/stl.h>
-
-#include <src/utility/storm.h>

stormpy/src/logic/formulae.cpp

@@ -1,7 +1,5 @@
 #include "formulae.h"
-
-#include "src/storm/common.h"
-#include "src/storm/logic/Formulas.h"
+#include "storm/logic/Formulas.h"
 
 void define_formulae(py::module& m) {
  

stormpy/src/mod_expressions.cpp

@@ -1,7 +1,6 @@
 #include "common.h"
 #include "helpers.h"
-
-#include <src/storage/expressions/ExpressionManager.h>
+#include "storm/storage/expressions/ExpressionManager.h"
 
 PYBIND11_PLUGIN(expressions) {
 	py::module m("expressions", "Storm expressions");

stormpy/src/mod_info.cpp

@@ -1,7 +1,6 @@
 #include "common.h"
 #include "helpers.h"
-
-#include <src/utility/storm-version.h>
+#include "storm/utility/storm-version.h"
 
 PYBIND11_PLUGIN(info) {
 	py::module m("info", "Storm information");

stormpy/src/storage/matrix.cpp

@@ -1,6 +1,5 @@
 #include "matrix.h"
-
-#include "src/storage/SparseMatrix.h"
+#include "storm/storage/SparseMatrix.h"
 
 typedef storm::storage::SparseMatrix<double>::index_type entry_index;
 typedef unsigned int row_index;

stormpy/src/storage/model.cpp

@@ -1,10 +1,9 @@
 #include "model.h"
-
-#include "src/models/ModelBase.h"
-#include "src/models/sparse/Model.h"
-#include "src/models/sparse/Dtmc.h"
-#include "src/models/sparse/Mdp.h"
-#include "src/models/sparse/StandardRewardModel.h"
+#include "storm/models/ModelBase.h"
+#include "storm/models/sparse/Model.h"
+#include "storm/models/sparse/Dtmc.h"
+#include "storm/models/sparse/Mdp.h"
+#include "storm/models/sparse/StandardRewardModel.h"
 
 // Thin wrapper for getting initial states
 template<typename ValueType>