Merge pull request #86: Download pybind11 via CMake instead of shippi…

…ng it

CHANGELOG.md

@@ -5,6 +5,12 @@ Changelog
 Version 1.7.x
 -------------
 
+### Version 1.7.x
+Requires Storm version >= 1.7.0 and pycarl version >= 2.1.0
+
+- Developer: improved build process
+- Developer: updated pybind version to 2.10.0. Check compatibility to pybind version of pycarl.
+
 ### Version 1.7.0 (2022/07)
 Requires Storm version >= 1.7.0 and pycarl version >= 2.1.0
 

CMakeLists.txt

@@ -1,15 +1,19 @@
-cmake_minimum_required(VERSION 3.8.0)
+cmake_minimum_required(VERSION 3.14) # Needed for FetchContent_MakeAvailable
+
 project(stormpy)
 
 option(USE_STORM_DFT "Enable support for DFTs" ON)
 option(USE_STORM_GSPN "Enable support for GSPNs" ON)
 option(USE_STORM_PARS "Enable support for parametric models" ON)
 option(USE_STORM_POMDP "Enable support for POMDPs" ON)
 option(STORMPY_DISABLE_SIGNATURE_DOC "Disable the signature in the documentation" OFF)
-
+MARK_AS_ADVANCED(STORMPY_DISABLE_SIGNATURE_DOC)
+set(PYBIND_VERSION "" CACHE STRING "Pybind11 version to use")
+MARK_AS_ADVANCED(PYBIND_VERSION)
 
 find_package(storm REQUIRED)
-add_subdirectory(resources/pybind11)
+
+include(resources/include_pybind11.cmake)
 
 include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/macros.cmake)
 

cmake/info_config.py.in

@@ -3,3 +3,4 @@
 storm_version = "@STORM_VERSION@"
 storm_cln_ea = @STORM_USE_CLN_EA_BOOL@
 storm_cln_rf = @STORM_USE_CLN_RF_BOOL@
+stormpy_pybind_version = "@PYBIND_VERSION@"

doc/checklist_new_release.md

@@ -9,7 +9,7 @@ The following steps should be performed when releasing a new stormpy version.
 
 2. Update used tool versions:
    * Update `storm_min_version` in `setup.py`
-   * Update `install_requires` version of pycarl in `setup.py`
+   * Update `install_requires`/`setup_requires` version of pycarl in `setup.py`
 
 3. Update the Storm Docker images for Github actions:
    * Set `RELEASE_IMG` and `DEBUG_IMG` in `.github/workflows/buildtest.yml`

resources/include_pybind11.cmake

@@ -0,0 +1,16 @@
+find_package(pybind11 ${PYBIND_VERSION} CONFIG QUIET)
+if(pybind11_FOUND)
+    message(STATUS "Stormpy - Using system version of pybind11 (version ${pybind_VERSION}).")
+else()
+    message(STATUS "Stormpy - Using shipped version of pybind11 (version ${PYBIND_VERSION}).")
+
+    include(FetchContent)
+    FetchContent_Declare(
+        pybind11
+        GIT_REPOSITORY https://github.com/pybind/pybind11
+        GIT_TAG        "v${PYBIND_VERSION}"
+    )
+
+    FetchContent_MakeAvailable(pybind11)
+endif()
+