various fixes

.github/workflows/buildtest.yml

@@ -207,9 +207,11 @@ jobs:
           docker exec ci bash -c "cd /opt/storm-starter; git checkout cmakeupdates"
       - name: Configure and make starter project on installed storm.
         run: |
-          docker exec ci bash -c "cd /opt/storm-starter; mkdir build-installed; cd build-installed; cmake .."
-          docker exec ci bash -c "cd /opt/storm-starter/build-installed make -j ${NR_JOBS}"
+          docker exec ci bash -c "mv /opt/storm/build /opt/storm/build-backup"
+          docker exec ci bash -c "cd /opt/storm-starter; mkdir build-installed; cd build-installed; cmake -DNEVER_FETCH_STORM=TRUE  .."
+          docker exec ci bash -c "cd /opt/storm-starter/build-installed; make -j ${NR_JOBS}"
           docker exec ci bash -c "/opt/storm-starter/build-installed/bin/starter-project"
+          docker exec ci bash -c "mv /opt/storm/build-backup /opt/storm/build"
 
   linuxTests:
     name: Linux Tests (${{ matrix.distro }}, ${{ matrix.buildType }})
@@ -266,9 +268,11 @@ jobs:
           docker exec ci bash -c "cd /opt/storm-starter; git checkout cmakeupdates"
       - name: Configure and make starter project on installed storm.
         run: |
-          docker exec ci bash -c "cd /opt/storm-starter; mkdir build-installed; cd build-installed; cmake .."
-          docker exec ci bash -c "cd /opt/storm-starter/build-installed make -j ${NR_JOBS}"
+          docker exec ci bash -c "mv /opt/storm/build /opt/storm/build-backup"
+          docker exec ci bash -c "cd /opt/storm-starter; mkdir build-installed; cd build-installed; cmake -DNEVER_FETCH_STORM=TRUE  .."
+          docker exec ci bash -c "cd /opt/storm-starter/build-installed; make -j ${NR_JOBS}"
           docker exec ci bash -c "/opt/storm-starter/build-installed/bin/starter-project"
+          docker exec ci bash -c "mv /opt/storm/build-backup /opt/storm/build"
   macTests:
     name: macOS Tests (${{ matrix.config.name }})
     strategy:
@@ -338,13 +342,13 @@ jobs:
         run: ctest test--output-on-failure
       - name: Install storm
         working-directory: ./build
-        run: make install
+        run: sudo make install
       - name: Run installed storm
         working-directory: .
         run: |
-          mv /opt/storm/build /opt/storm/build-backup
+          mv ${GITHUB_WORKSPACE}/build ${GITHUB_WORKSPACE}/build-backup
           /usr/local/bin/storm --version"
-          mv /opt/storm/build-backup /opt/storm/build
+          mv ${GITHUB_WORKSPACE}/build-backup ${GITHUB_WORKSPACE}/build
   deploy:
     name: Test and Deploy (${{ matrix.buildType.name }})
     runs-on: ubuntu-latest
@@ -412,9 +416,11 @@ jobs:
           docker exec ci bash -c "cd /opt/storm-starter; git checkout cmakeupdates"
       - name: Configure and make starter project on installed storm.
         run: |
-          docker exec ci bash -c "cd /opt/storm-starter; mkdir build-installed; cd build-installed; cmake .."
-          docker exec ci bash -c "cd /opt/storm-starter/build-installed make -j ${NR_JOBS}"
+          docker exec ci bash -c "mv /opt/storm/build /opt/storm/build-backup"
+          docker exec ci bash -c "cd /opt/storm-starter; mkdir build-installed; cd build-installed; cmake -DNEVER_FETCH_STORM=TRUE .."
+          docker exec ci bash -c "cd /opt/storm-starter/build-installed; make -j ${NR_JOBS}"
           docker exec ci bash -c "/opt/storm-starter/build-installed/bin/starter-project"
+          docker exec ci bash -c "mv /opt/storm/build-backup /opt/storm/build"
       - name: Login into docker
         # Only login if using master on original repo (and not for pull requests or forks)
         if: github.repository_owner == 'moves-rwth' && github.ref == 'refs/heads/master'

CMakeLists.txt

@@ -485,6 +485,9 @@ message(STATUS "Storm - Build type: ${CMAKE_BUILD_TYPE}")
 # in the the system does not have a library
 include(resources/3rdparty/CMakeLists.txt)
 
+SET(STORM_HAVE_LP_SOLVER (STORM_HAVE_GLPK OR STORM_HAVE_GUROBI OR STORM_HAVE_SOPLEX OR STORM_HAVE_Z3_OPTIMIZE))
+
+
 if(PROJECT_IS_TOP_LEVEL)
 	# Include Doxygen
 	include(resources/doxygen/CMakeLists.txt)

resources/3rdparty/CMakeLists.txt

@@ -205,6 +205,7 @@ find_package(Z3 QUIET 4.8.7 NO_MODULE)
 # Notice that such old z3 versions do not provide config files, so we could bump this version ahead.
 if(TARGET z3::libz3)
     set(STORM_HAVE_Z3 ON)
+    set(STORM_Z3_CONFIG ON) # For the config file, did we include z3 via a config (yes)
 
     set(Z3_VERSION "${Z3_VERSION_MAJOR}.${Z3_VERSION_MINOR}.${Z3_VERSION_PATCH}")
 
@@ -223,7 +224,10 @@ else()
     find_package(Z3 QUIET 4.8.7)
 
     if (Z3_FOUND)
+
         set(STORM_HAVE_Z3 ON)
+        set(STORM_Z3_CONFIG OFF) # For the config file, did we include z3 via a config (no)
+
         if ("${Z3_VERSION}" VERSION_EQUAL "4.10.1")
             message (WARNING "Storm cannot be linked against Z3 version 4.10.1, see issue 252.")
             message(WARNING "Storm - Could not link with z3. Building of Prism/JANI models will not be supported.")

resources/3rdparty/include_glpk.cmake

@@ -18,31 +18,5 @@ if(GLPK_FOUND)
 else()
     message (WARNING "Storm - Not using GLPK.")
 endif()
-#    set(GLPK_LIB_DIR ${STORM_3RDPARTY_BINARY_DIR}/glpk-5.0/lib)
-#
-#	# Set sysroot to circumvent problems in macOS "Mojave" (or higher) where the header files are no longer in /usr/include
-#	set(GLPK_INCLUDE_FLAGS "")
-#	if (CMAKE_OSX_SYSROOT)
-#	    set(GLPK_INCLUDE_FLAGS "CPPFLAGS=--sysroot=${CMAKE_OSX_SYSROOT}")
-#	endif()
-#
-#    ExternalProject_Add(glpk_ext
-#        DOWNLOAD_COMMAND ""
-#        PREFIX ${STORM_3RDPARTY_BINARY_DIR}/glpk-5.0
-#        SOURCE_DIR ${STORM_3RDPARTY_SOURCE_DIR}/glpk-5.0
-#        CONFIGURE_COMMAND ${STORM_3RDPARTY_SOURCE_DIR}/glpk-5.0/configure --prefix=${STORM_3RDPARTY_BINARY_DIR}/glpk-5.0  --libdir=${GLPK_LIB_DIR} CC=${CMAKE_C_COMPILER} CXX=${CMAKE_CXX_COMPILER} ${GLPK_INCLUDE_FLAGS}
-#        BUILD_COMMAND make "CFLAGS=-O3 -w" -j${STORM_RESOURCES_BUILD_JOBCOUNT}
-#        INSTALL_COMMAND make install -j${STORM_RESOURCES_BUILD_JOBCOUNT}
-#        BUILD_IN_SOURCE 0
-#        LOG_CONFIGURE ON
-#        LOG_BUILD ON
-#        LOG_INSTALL ON
-#        BUILD_BYPRODUCTS ${GLPK_LIB_DIR}/libglpk${DYNAMIC_EXT} ${GLPK_LIB_DIR}/libglpk${STATIC_EXT}
-#    )
-#    set(GLPK_LIBRARIES  ${GLPK_LIB_DIR}/libglpk${DYNAMIC_EXT})
-#    set(GLPK_INCLUDE_DIR ${STORM_3RDPARTY_BINARY_DIR}/glpk-5.0/include)
-#    set(GLPK_VERSION_STRING 5.0)
-#    add_dependencies(storm_resources glpk_ext)
-#endif()
 
 

src/storm-config.h.in

@@ -82,6 +82,7 @@
 #cmakedefine STORM_HAVE_SOPLEX
 #cmakedefine STORM_HAVE_SPOT
 #cmakedefine STORM_HAVE_XERCES
+#cmakedefine STORM_HAVE_LP_SOLVER
 // Whether Intel Threading Building Blocks are available and to be used
 #cmakedefine STORM_HAVE_INTELTBB
 // Whether LTL model checking shall be enabled

src/test/storm/solver/LpSolverTest.cpp

@@ -22,7 +22,11 @@ class DefaultEnvironment {
     static const bool strictRelationSupport = true;
 
     static bool skip() {
+#ifdef STORM_HAVE_LP_SOLVER
         return false;
+#else
+        return true;
+#endif
     }
 };