78bda829d9
- Add scikit-build-pr450-findf2py.patch to find the flavor specific f2py - see discussion on opensuse OBS-URL: https://build.opensuse.org/request/show/791975 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:numeric/python-scikit-build?expand=0&rev=5
28 lines
1.0 KiB
Diff
28 lines
1.0 KiB
Diff
From 3ab8fb174a13df1f7fe4c341518a51e7ed09b46a Mon Sep 17 00:00:00 2001
|
|
From: Jean-Christophe Fillion-Robin <jchris.fillionr@kitware.com>
|
|
Date: Tue, 24 Sep 2019 14:54:40 -0400
|
|
Subject: [PATCH] FindF2PY: Ensure python version specific of f2py executable
|
|
is looked up first
|
|
|
|
See #449
|
|
|
|
Co-authored-by: Ben <code@bnavigator.de>
|
|
---
|
|
(CHANGES.rst | 6 +++++-) removed from package
|
|
skbuild/resources/cmake/FindF2PY.cmake | 2 +-
|
|
2 files changed, 6 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/skbuild/resources/cmake/FindF2PY.cmake b/skbuild/resources/cmake/FindF2PY.cmake
|
|
index 0ab0fdbe..22d669c2 100644
|
|
--- a/skbuild/resources/cmake/FindF2PY.cmake
|
|
+++ b/skbuild/resources/cmake/FindF2PY.cmake
|
|
@@ -66,7 +66,7 @@
|
|
# case, CMake is not used to find the compiler and configure the associated build system.
|
|
#
|
|
|
|
-find_program(F2PY_EXECUTABLE NAMES f2py f2py${PYTHON_VERSION_MAJOR})
|
|
+find_program(F2PY_EXECUTABLE NAMES f2py${PYTHON_VERSION_MAJOR} f2py)
|
|
|
|
if(F2PY_EXECUTABLE)
|
|
# extract the version string
|