Cmake updates

.github/workflows/Dockerfile.archlinux

@@ -16,6 +16,7 @@ ARG no_threads=1
 
 # Specify Storm configuration (ON/OFF)
 ARG gurobi_support="ON"
+ARG mathsat_support="ON"
 ARG soplex_support="ON"
 ARG spot_support="ON"
 ARG developer="OFF"
@@ -51,6 +52,7 @@ WORKDIR /opt/storm/build
 RUN cmake .. -DCMAKE_BUILD_TYPE=$build_type \
              -DSTORM_PORTABLE=ON \
              -DSTORM_USE_GUROBI=$gurobi_support \
+             -DSTORM_USE_MATHSAT=$mathsat_support \
              -DSTORM_USE_SOPLEX=$soplex_support \
              -DSTORM_USE_SPOT_SYSTEM=$spot_support \
              -DSTORM_DEVELOPER=$developer \
@@ -68,5 +70,4 @@ RUN make storm -j $no_threads
 # (This can be skipped or adapted depending on custom needs)
 RUN make binaries -j $no_threads
 
-# Set path
-ENV PATH="/opt/storm/build/bin:$PATH"
+WORKDIR /opt/storm

.github/workflows/Dockerfile.doxygen

@@ -36,6 +36,7 @@ WORKDIR /opt/storm/build
 RUN cmake .. -DCMAKE_BUILD_TYPE=Release \
              -DSTORM_PORTABLE=ON \
              -DSTORM_USE_GUROBI=ON \
+             -DSTORM_USE_MATHSAT=ON \
              -DSTORM_USE_SOPLEX=ON \
              -DSTORM_USE_SPOT_SYSTEM=ON
 

.github/workflows/release_docker.yml

@@ -39,7 +39,7 @@ jobs:
             --build-arg developer="${{ matrix.buildType.Developer }}" \
             --build-arg cmake_args="${{ matrix.buildType.cmakeArgs }}" \
             --build-arg no_threads=${NR_JOBS}
-            # Omitting arguments gurobi_support, soplex_support, spot_support, cln_exact, cln_ratfunc, all_sanitizers
+            # Omitting arguments gurobi_support, soplex_support, mathsat_support, spot_support, cln_exact, cln_ratfunc, all_sanitizers
       - name: Login to Docker Hub
         # Only login if using original repo
         if: github.repository_owner == 'moves-rwth'

Dockerfile

@@ -26,6 +26,7 @@ ARG spot_support="ON"
 ARG developer="OFF"
 ARG cln_exact="OFF"
 ARG cln_ratfunc="ON"
+ARG mathsat_support="ON"
 ARG all_sanitizers="OFF"
 
 # Specify additional CMake arguments for Storm
@@ -48,6 +49,7 @@ WORKDIR /opt/storm/build
 RUN cmake .. -DCMAKE_BUILD_TYPE=$build_type \
              -DSTORM_PORTABLE=ON \
              -DSTORM_USE_GUROBI=$gurobi_support \
+             -DSTORM_USE_MATHSAT=$mathsat_support \
              -DSTORM_USE_SOPLEX=$soplex_support \
              -DSTORM_USE_SPOT_SYSTEM=$spot_support \
              -DSTORM_DEVELOPER=$developer \
@@ -65,5 +67,4 @@ RUN make storm -j $no_threads
 # (This can be skipped or adapted depending on custom needs)
 RUN make binaries -j $no_threads
 
-# Set path
-ENV PATH="/opt/storm/build/bin:$PATH"
+WORKDIR /opt/storm

StormCPackConfig.cmake

@@ -5,7 +5,7 @@ include(InstallRequiredSystemLibraries)
 
 ### general settings
 set(CPACK_PACKAGE_NAME "Storm")
-set(CPACK_PACKAGE_VENDOR "RWTH Aachen University")
+set(CPACK_PACKAGE_VENDOR "Storm Developers")
 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Storm - A probabilistic model checker written in C++.")
 set(CPACK_PACKAGE_CONTACT "[email protected]")
 

doc/update_resources.md

@@ -17,6 +17,7 @@ In case a new patch needs to be created follow these steps:
 6. Resolve issues, make changes, and commit them
 7. Create a new patch file via `git format-patch <new_commit_hash> --stdout > eigen.patch`, where `<new_commit_hash>` is the tag, branch or commit from step 5
 8. add the patch to resources/patches/ and change the resources/3rdparty/CmakeLists.txt file accordingly.
+
 ## GLPK
 
 To update GLPK, download the new sources from [here](https://ftp.gnu.org/gnu/glpk/) and put them into `$STORM_DIR/resources/3rdparty/glpk-5.0`.