Skip to content

Commit

Permalink
Use mainstream Python
Browse files Browse the repository at this point in the history
  • Loading branch information
wawanbreton committed Sep 16, 2024
1 parent b1b2474 commit 3cd2724
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 15 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
cmake_minimum_required(VERSION 3.20)
cmake_policy(SET CMP0091 NEW)
project(pynest2d)
cmake_minimum_required(VERSION 3.20)

find_package(nest2d REQUIRED)
find_package(cpython REQUIRED)
find_package(Python REQUIRED)

find_package(standardprojectsettings REQUIRED)
find_package(sipbuildtool REQUIRED)
Expand Down
15 changes: 2 additions & 13 deletions conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
from conan.tools.microsoft import check_min_vs, is_msvc, is_msvc_static_runtime
from conan.tools.scm import Version, Git

required_conan_version = ">=1.58.0"
required_conan_version = ">=2.7.0"


class PyNest2DConan(ConanFile):
Expand Down Expand Up @@ -84,7 +84,7 @@ def validate(self):
def build_requirements(self):
self.test_requires("standardprojectsettings/[>=0.2.0]@ultimaker/cura_11622") # FIXME: use stable after merge
self.test_requires("sipbuildtool/[>=0.3.0]@ultimaker/cura_11622") # FIXME: use stable after merge
self.test_requires("cpython/3.12.2@ultimaker/cura_11622") # FIXME: use stable after merge
self.test_requires("cpython/3.12.2")

def config_options(self):
if self.settings.os == "Windows":
Expand All @@ -107,17 +107,6 @@ def generate(self):
tc = CMakeToolchain(self)
if is_msvc(self):
tc.variables["USE_MSVC_RUNTIME_LIBRARY_DLL"] = not is_msvc_static_runtime(self)
tc.cache_variables["CMAKE_POLICY_DEFAULT_CMP0148"] = "OLD"
cpython_conf = self.dependencies["cpython"].conf_info
tc.variables["Python_EXECUTABLE"] = cpython_conf.get("user.cpython:python").replace("\\", "/")
tc.variables["Python_ROOT_DIR"] = cpython_conf.get("user.cpython:python_root").replace("\\", "/")
cpython_options = self.dependencies["cpython"].options
tc.variables["Python_USE_STATIC_LIBS"] = not cpython_options.shared
tc.variables["Python_FIND_FRAMEWORK"] = "NEVER"
tc.variables["Python_FIND_REGISTRY"] = "NEVER"
tc.variables["Python_FIND_IMPLEMENTATIONS"] = "CPython"
tc.variables["Python_FIND_STRATEGY"] = "LOCATION"
tc.variables["Python_SITEARCH"] = "site-packages"
tc.generate()

# Generate the Source code from SIP
Expand Down

0 comments on commit 3cd2724

Please sign in to comment.