Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@ include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/macros.cmake)
set(CMAKE_CXX_STANDARD 20)

# Configuration options
set(PYBIND_VERSION "" CACHE STRING "Pybind11 version to use")
MARK_AS_ADVANCED(PYBIND_VERSION)
set(STORM_DIR_HINT "" CACHE STRING "A hint where the Storm library can be found.")
option(ALLOW_STORM_SYSTEM "Allow finding a storm version on the system" ON)
option(ALLOW_STORM_FETCH "Allow fetching storm" ON)
Expand All @@ -32,7 +30,8 @@ mark_as_advanced(COMPILE_WITH_CCACHE)

# Find the module development requirements (requires FindPython from 3.17 or scikit-build-core's built-in backport)
find_package(Python REQUIRED COMPONENTS Interpreter Development.Module)
include(resources/include_pybind11.cmake)
set(PYBIND11_FINDPYTHON ON)
find_package(pybind11 CONFIG REQUIRED)
message(STATUS "Stormpy - Using pybind11 version ${pybind11_VERSION}")

# Helper function to print path where library was found and check whether hint was used
Expand Down
1 change: 0 additions & 1 deletion cmake/info_config.py.in
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,3 @@
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@"
3 changes: 1 addition & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[build-system]
requires = ["scikit-build-core"]
requires = ["scikit-build-core", "pybind11"]
build-backend = "scikit_build_core.build"

[project]
Expand Down Expand Up @@ -76,7 +76,6 @@ sdist.include = [
]

[tool.scikit-build.cmake.define]
PYBIND_VERSION="2.12.1"
STORM_DIR_HINT=""
ALLOW_STORM_SYSTEM="ON"
ALLOW_STORM_FETCH="ON"
Expand Down
15 changes: 0 additions & 15 deletions resources/include_pybind11.cmake

This file was deleted.