Fixed python after merge

Former-commit-id: 73c1c88a1f

src/CMakeLists.txt

@@ -112,7 +112,7 @@ endif(ADDITIONAL_LINK_DIRS)
 ##  All link_directories() calls MUST be made before this point               #
 ##                                                                            #
 ###############################################################################
-add_library(storm STATIC ${STORM_LIB_SOURCES} ${STORM_LIB_HEADERS}) # Adding headers for xcode
+add_library(storm SHARED ${STORM_LIB_SOURCES} ${STORM_LIB_HEADERS}) # Adding headers for xcode
 add_dependencies(storm sylvan)
 add_dependencies(storm resources)
 add_executable(storm-main ${STORM_MAIN_SOURCES} ${STORM_MAIN_HEADERS})

stormpy/setup.py

@@ -24,7 +24,7 @@ carl_dir = "/Users/mvolk/develop/carl/src/"
 include_dirs.append(carl_dir)
 boost_dir = '/usr/local/include/'
 include_dirs.append(boost_dir)
-cudd_dirs = ['../resources/3rdparty/cudd-2.5.0/src/obj/', '../resources/3rdparty/cudd-2.5.0/src/cudd', '../resources/3rdparty/cudd-2.5.0/src/mtr/', '../resources/3rdparty/cudd-2.5.0/src/epd/']
+cudd_dirs = ['../resources/3rdparty/cudd-3.0.0/cplusplus/', '../resources/3rdparty/cudd-3.0.0/mtr/', '../resources/3rdparty/cudd-3.0.0/cudd/']
 include_dirs.extend(cudd_dirs)
 log4cplus_dirs = ['../resources/3rdparty/log4cplus-1.1.3-rc1/include/', '../build/resources/3rdparty/log4cplus-1.1.3-rc1/include/']
 include_dirs.extend(log4cplus_dirs)

stormpy/src/common.h

@@ -12,7 +12,6 @@
 #include <pybind11/stl.h>
 #include <tuple>
 
-#include "includes.h"
 namespace py = pybind11;
 
 #if PY_MAJOR_VERSION >= 3

stormpy/src/logic/formulas.cpp → stormpy/src/logic/formulae.cpp

@@ -1,8 +1,9 @@
-#include "formulas.h"
+#include "formulae.h"
 
 #include "src/common.h"
+#include "src/logic/Formulas.h"
 
-void define_formulas(py::module& m) {
+void define_formulae(py::module& m) {
  
     py::enum_<storm::logic::ComparisonType>(m, "ComparisonType")
         .value("LESS", storm::logic::ComparisonType::Less)

stormpy/src/logic/formulae.h

@@ -0,0 +1,8 @@
+#ifndef PYTHON_LOGIC_FORMULAE_H_
+#define PYTHON_LOGIC_FORMULAE_H_
+
+#include "src/common.h"
+
+void define_formulae(py::module& m);
+
+#endif /* PYTHON_LOGIC_FORMULAE_H_ */

stormpy/src/logic/formulas.h

@@ -1,8 +0,0 @@
-#ifndef PYTHON_LOGIC_FORMULAS_H_
-#define PYTHON_LOGIC_FORMULAS_H_
-
-#include "src/common.h"
-
-void define_formulas(py::module& m);
-
-#endif /* PYTHON_LOGIC_FORMULAS_H_ */

stormpy/src/mod_logic.cpp

@@ -1,9 +1,9 @@
 #include "common.h"
 
-#include "logic/formulas.h"
+#include "logic/formulae.h"
 
 PYBIND11_PLUGIN(logic) {
     py::module m("stormpy.logic", "Logic module for Storm");
-    define_formulas(m);
+    define_formulae(m);
     return m.ptr();
 }