From b6d3e4c0aad87c8efb17b08ea99a2be03bcd69da Mon Sep 17 00:00:00 2001 From: PBerger Date: Sun, 2 Mar 2014 17:14:43 +0100 Subject: [PATCH] Fixed includes in a function (linkage errors). Former-commit-id: d7554655ec5dde72c733e6c4e477863f1b94e809 --- src/storm.cpp | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/src/storm.cpp b/src/storm.cpp index e53648fbc..999e3c6d0 100644 --- a/src/storm.cpp +++ b/src/storm.cpp @@ -60,6 +60,20 @@ #include "src/exceptions/InvalidSettingsException.h" +// Includes for the linked libraries and versions header +#ifdef STORM_HAVE_INTELTBB +# include "tbb/tbb_stddef.h" +#endif +#ifdef STORM_HAVE_GLPK +# include "glpk.h" +#endif +#ifdef STORM_HAVE_GUROBI +# include "gurobi_c.h" +#endif +#ifdef STORM_HAVE_Z3 +# include "z3.h" +#endif + #include #include #include @@ -142,22 +156,15 @@ void printHeader(const int argc, const char* argv[]) { std::cout << "Version: 1.0 Alpha" << std::endl; #ifdef STORM_HAVE_INTELTBB -# include "tbb/tbb_stddef.h" std::cout << "Linked with Intel Threading Building Blocks v" << TBB_VERSION_MAJOR << "." << TBB_VERSION_MINOR << " (Interface version " << TBB_INTERFACE_VERSION << ")." << std::endl; #endif - #ifdef STORM_HAVE_GLPK -# include "glpk.h" std::cout << "Linked with GNU Linear Programming Kit v" << GLP_MAJOR_VERSION << "." << GLP_MINOR_VERSION << "." << std::endl; #endif - #ifdef STORM_HAVE_GUROBI -# include "gurobi_c.h" std::cout << "Linked with Gurobi Optimizer v" << GRB_VERSION_MAJOR << "." << GRB_VERSION_MINOR << "." << GRB_VERSION_TECHNICAL << "." << std::endl; #endif - #ifdef STORM_HAVE_Z3 -# include "z3.h" unsigned int z3Major, z3Minor, z3BuildNumber, z3RevisionNumber; Z3_get_version(&z3Major, &z3Minor, &z3BuildNumber, &z3RevisionNumber); std::cout << "Linked with Microsoft Z3 Optimizer v" << z3Major << "." << z3Minor << " Build " << z3BuildNumber << " Rev " << z3RevisionNumber << "." << std::endl;