diff --git a/cmake/set_dependencies.cmake b/cmake/set_dependencies.cmake index ce237f0..a435548 100644 --- a/cmake/set_dependencies.cmake +++ b/cmake/set_dependencies.cmake @@ -45,7 +45,7 @@ include_guard(GLOBAL) # Version of Boost to use. It will be used as the argument to the `find_package(Boost)` call. -overridable_variable(BOOST_VERSION 1.77) +overridable_variable(BOOST_VERSION 1.78) # Version of pybind11 to use. overridable_variable(PYBIND11_VERSION 2.9.0) @@ -66,10 +66,8 @@ overridable_variable(GOOGLETEST_GIT_REPOSITORY https://github.com/google/googlet # `ExternalProject` module documentation of the `GIT_TAG` argument. overridable_variable(GOOGLETEST_GIT_TAG main) -set(PYTHON_VERSION_STRING "" CACHE STRING "Version of Python to look for. This \ -variable can be specified by tools run directly from Python to enforce the \ -use of the same version.") -mark_as_advanced(PYTHON_VERSION_STRING) + +overridable_variable(PYTHON_VERSION 3.10) if(NOT COMMAND FetchContent_Declare) include(FetchContent) @@ -173,11 +171,8 @@ find_package(OpenSSL REQUIRED) # Python parse_python_version(_python_version "${PYTHON_VERSION_STRING}") -if(_python_version_VERSION_STRING) - set(_python_version ${_python_version_VERSION_RELEASE_MAJOR_MINOR}) -else() - set(_python_version 3.5) # default to Python 3.5+. -endif() +set(_python_version 3.10) + # Set variables that the CMake module recognizes from variables that the # scikit-build build system module may pass to us. @@ -194,10 +189,8 @@ endif() # only, but this time force the module to find it or fail (REQUIRED). # Some of our toolchains (when crosscompiling for instance) have the Python # library but not an interpreter that can run on the host. -find_package(Python ${_python_version} COMPONENTS Development Interpreter) -if(NOT Python_FOUND) - find_package(Python ${_python_version} REQUIRED COMPONENTS Development) -endif() +find_package(Python ${_python_version} EXACT COMPONENTS Development Interpreter) + list(GET Python_LIBRARIES 0 _py_lib) add_library(python_headers INTERFACE) diff --git a/pyproject.toml b/pyproject.toml index cc4c529..f33184e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,4 +1,6 @@ [project] +name = "qi" +version = "3.1.1" dependencies = [ "packaging" ] diff --git a/setup.py b/setup.py index 66c1e53..1c2f52f 100755 --- a/setup.py +++ b/setup.py @@ -61,6 +61,7 @@ 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.9', + 'Programming Language :: Python :: 3.10', 'Programming Language :: Python :: 3 :: Only', ], cmake_args=['-DQIPYTHON_STANDALONE:BOOL=ON'],