Fixed build issues

.github/workflows/buildtest.yml

@@ -166,7 +166,7 @@ jobs:
         run: docker exec ci bash -c "cd /opt/stormpy; pytest ${{ matrix.config.test_opt }}"
 
 
-  macTests:
+  macFetchTests:
     name: Mac Tests (Fetch, ${{ matrix.config.name }})
     strategy:
       matrix:
@@ -192,6 +192,13 @@ jobs:
              setup_args: "--config-settings=cmake.define.ALLOW_STORM_SYSTEM=OFF",
              optional_libs: "[test,plot]"
           }
+          - {name: "XCode 16.3, ARM, Release",
+             distro: "macos-15",
+             xcode: "16.3",
+             build_type: "Release",
+             setup_args: "--config-settings=cmake.define.ALLOW_STORM_SYSTEM=OFF",
+             optional_libs: "[test,plot]"
+          }
     runs-on: ${{ matrix.config.distro }}
     steps:
       - uses: maxim-lobanov/setup-xcode@v1
@@ -214,6 +221,63 @@ jobs:
         run: pytest
 
 
+  macInstallTests:
+    name: Mac Tests (Install, ${{ matrix.config.name }})
+    strategy:
+      matrix:
+        config:
+          - {name: "XCode 16.3, ARM, Debug",
+             distro: "macos-15",
+             xcode: "16.3",
+             build_type: "Debug",
+             setup_args: "--config-settings=cmake.define.ALLOW_STORM_FETCH=OFF",
+             optional_libs: "[test,plot]"
+          }
+          - {name: "XCode 16.3, ARM, Release",
+             distro: "macos-15",
+             xcode: "16.3",
+             build_type: "Release",
+             setup_args: "--config-settings=cmake.define.ALLOW_STORM_FETCH=ON",
+             optional_libs: "[test,plot]"
+          }
+    runs-on: ${{ matrix.config.distro }}
+    steps:
+      - uses: maxim-lobanov/setup-xcode@v1
+        with:
+          xcode-version: ${{ matrix.config.xcode }}
+      - name: Git clone
+        uses: actions/checkout@v4
+      - name: Install dependencies
+        # cmake and gmp and python3 are already installed
+        run: |
+          brew update
+          brew install automake boost cln ginac glpk hwloc xerces-c z3
+      - name: Checkout Storm
+        uses: actions/checkout@v4
+        with:
+          repository: moves-rwth/storm
+          ref: master
+          path: storm
+      - name: Build and install Storm
+        working-directory: storm
+        run: |
+          mkdir build
+          cd build
+          cmake .. -DCMAKE_BUILD_TYPE="${{ matrix.config.build_type }}" -DSTORM_BUILD_TESTS=OFF -DSTORM_BUILD_EXECUTABLES=OFF
+          make -j ${NR_JOBS}
+          sudo make install
+          cd ..
+          rm -rf build
+      - name: Build stormpy
+        run: |
+          pip install -v \
+            --config-settings=cmake.build-type=${{ matrix.config.build_type }} \
+            --config-settings=cmake.define.CMAKE_BUILD_PARALLEL_LEVEL=${NR_JOBS} \
+            ${{ matrix.config.setup_args }} .${{ matrix.config.optional_libs }}
+      - name: Run tests
+        run: pytest
+
+
   deploy:
     name: Test and Deploy on latest (${{ matrix.build_type.name }})
     runs-on: ubuntu-latest
@@ -282,7 +346,7 @@ jobs:
   notify:
     name: Email notification
     runs-on: ubuntu-latest
-    needs: [indepthTests, stableTests, linuxTests, macTests, deploy]
+    needs: [indepthTests, stableTests, linuxTests, macFetchTests, macInstallTests, deploy]
     # Only run in main repo and even if previous step failed
     if: github.repository_owner == 'moves-rwth' && always()
     steps:

.github/workflows/wheelpypi.yml

@@ -2,11 +2,6 @@ name: Build and upload to PyPI
 
 on:
   workflow_dispatch:
-  schedule:
-    # run weekly
-    - cron: '0 10 * * 3'
-  pull_request:
-  push:
   release:
     types:
       - published

CMakeLists.txt

@@ -103,9 +103,12 @@ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/lib/stormpy")
 
 # This sets interprocedural optimization off as this leads to some problems on some systems
 set(CMAKE_INTERPROCEDURAL_OPTIMIZATION OFF)
-# This sets the default visibility from hidden to default,
-# which is recommended *not* to do, but leads to errors otherwise.
-set(CMAKE_CXX_VISIBILITY_PRESET "default")
+
+if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+    # This sets the default visibility from hidden to default,
+    # which is recommended *not* to do, but leads to errors otherwise.
+    set(CMAKE_CXX_VISIBILITY_PRESET "default")
+endif()
 
 # RPATH settings (https://gitlab.kitware.com/cmake/community/-/wikis/doc/cmake/RPATH-handling#always-full-rpath)
 # don't skip the full RPATH for the build tree

cmake/macros.cmake

@@ -11,8 +11,7 @@ endfunction(set_variable_string)
 # Sets variable HAVE_STORM_XYZ
 function(storm_with_lib NAME)
     string(TOLOWER ${NAME} NAME_LOWER)
-    find_library(STORM_${NAME} NAMES storm-${NAME_LOWER} HINTS "${storm_DIR}/lib/")
-    if(STORM_${NAME})
+    if(TARGET storm-${NAME_LOWER})
         set(HAVE_STORM_${NAME} TRUE PARENT_SCOPE)
     else()
         set(HAVE_STORM_${NAME} FALSE PARENT_SCOPE)