Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
gaoqiong
pybind11
Commits
b4dcb8f2
Commit
b4dcb8f2
authored
Jun 12, 2016
by
Wenzel Jakob
Committed by
GitHub
Jun 12, 2016
Browse files
Merge pull request #237 from dean0x7d/pythonlibs
Skip FindPythonLibsNew if PYTHONLIBS_FOUND is defined (fix #236)
parents
19d95ef0
e782eb86
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
9 deletions
+5
-9
tools/FindPythonLibsNew.cmake
tools/FindPythonLibsNew.cmake
+5
-9
No files found.
tools/FindPythonLibsNew.cmake
View file @
b4dcb8f2
...
...
@@ -7,14 +7,11 @@
# PYTHON_PREFIX - path to the Python installation
# PYTHON_LIBRARIES - path to the python library
# PYTHON_INCLUDE_DIRS - path to where Python.h is found
# PYTHON_MODULE_EXTENSION - lib extension, e.g. '.so' or '.pyd'
# PYTHON_MODULE_PREFIX - lib name prefix: usually an empty string
# PYTHON_SITE_PACKAGES - path to installation site-packages
# PYTHON_IS_DEBUG - whether the Python interpreter is a debug build
#
# PYTHON_INCLUDE_PATH - path to where Python.h is found (deprecated)
#
# A function PYTHON_ADD_MODULE(<name> src1 src2 ... srcN) is defined
# to build modules for python.
#
# Thanks to talljimbo for the patch adding the 'LDVERSION' config
# variable usage.
...
...
@@ -53,6 +50,9 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#=============================================================================
if
(
PYTHONLIBS_FOUND
)
return
()
endif
()
# Use the Python interpreter to find the libs.
if
(
PythonLibsNew_FIND_REQUIRED
)
...
...
@@ -165,10 +165,6 @@ else()
endif
()
endif
()
# For backward compatibility, set PYTHON_INCLUDE_PATH, but make it internal.
SET
(
PYTHON_INCLUDE_PATH
"
${
PYTHON_INCLUDE_DIR
}
"
CACHE INTERNAL
"Path to where Python.h is found (deprecated)"
)
MARK_AS_ADVANCED
(
PYTHON_LIBRARY
PYTHON_INCLUDE_DIR
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment