Kitware/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2025-10-14 02:08:27 +08:00
Code Issues Projects Releases Wiki Activity
49,672 Commits 2 Branches 375 Tags
7658d5c52d653ec6da8301a412c69e6a4e7e651d
Commit Graph

83 Commits

Author SHA1 Message Date
Marc Chevrier
6fdfe2428d FindPython: enhance ABI checks against include directory 
Fixes: #21149
 2020-09-02 15:41:16 +02:00
Marc Chevrier
72822e26c9 FindPython: enhance robustness of version extraction from library name 
Fixes: #21105
 2020-08-18 12:30:47 +02:00
Marc Chevrier
951640f1f9 FindPython: manage SOABI for all Python versions 
Fixes: #21070
 2020-08-11 10:16:40 +02:00
Marc Chevrier
a92d384548 FindPython: ensure user's policies are respected 
Do not set the policy version before recording our internal macros such
as `__Python_add_library`.  Otherwise callers get our policy version
instead of theirs.  Instead just set the specific policies we need.

Also fix one case in our test suite where we were accidentally
relying on the policy version to be set by `FindPython`.

Fixes: #21042
 2020-08-07 09:24:18 -04:00
Marc Chevrier
e7b9f928f7 FindPython: use CMAKE specific variables to look-up debug library 
Fixes: #20714
 2020-05-18 15:11:19 +02:00
Marc Chevrier
e8ffc60220 FindPython: Add IronPython support on all platforms 2020-05-11 14:02:59 +02:00
Marc Chevrier
e1c869906c FindPython: ensure any specified version is correctly handled 
Fixes: #20674
 2020-05-07 11:20:43 +02:00
Marc Chevrier
c1ef70d4d1 FindPython: Add support for 'PyPy' 2020-05-01 15:03:04 +02:00
Marc Chevrier
e67dba730e FindPython: fix error on FPHSA call 2020-04-29 13:41:56 +02:00
Marc Chevrier
d2c47c822b FindPython: Add capability to specify Python implementations 
Through hint Python_FIND_IMPLEMENTATIONS it is possble to specify, as an
ordered list, which implementations must be searched for.
Currently possible values are:
* CPython
* IronPython
 2020-04-28 13:56:18 +02:00
Brad King
9e3d982e05 Merge topic 'FindPython-reason-failure' 
a7eca04163 FindPython: fix reason failure propagation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4660
 2020-04-27 10:41:20 -04:00
Marc Chevrier
a7eca04163 FindPython: fix reason failure propagation 2020-04-24 15:47:05 +02:00
Brad King
360862f845 Merge topic 'FindPython-fix-python-compiler-validation' 
f39da773ee FindPython: fix python compiler validation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4655
 2020-04-24 08:36:17 -04:00
Marc Chevrier
f39da773ee FindPython: fix python compiler validation 
Ensure also the cache of properties is erased in case of multiple
searches.

Fixes: #20626, #20627
 2020-04-23 17:47:22 +02:00
Ben Boeckel
c6ba196314 FindPython: remove unnecessary if check 
`list(REMOVE_DUPLICATES)` is safe on empty lists since 3.14.
 2020-04-20 10:30:09 -04:00
Ben Boeckel
62b51845db FindPython: fix some indentation 2020-04-17 09:00:26 -04:00
Marc Chevrier
c1b4044d3e FindPython: add sub-components to Development component 
Fixes: #20425
 2020-04-16 14:38:39 +02:00
Brad King
d561898572 Merge topic 'FindPython-if-auto-deref' 
894fdea2a9 FindPython: remove extra dereference
0b9c9e2c8c FindPython: avoid autoderef in version comparisons

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4610
 2020-04-15 09:38:03 -04:00
Ben Boeckel
894fdea2a9 FindPython: remove extra dereference 
If the version is not found (e.g., missing headers), this causes a CMake
error about `if(blah VERSION_EQUAL)` being an invalid statement.
 2020-04-14 11:03:35 -04:00
Ben Boeckel
0b9c9e2c8c FindPython: avoid autoderef in version comparisons 2020-04-14 11:03:35 -04:00
Brad King
d26f15dfce Merge topic 'FindPython-fix-VIRTUALENV-eq-FIRST' into release-3.17 
81beb28752 FindPython: fix handling when FIND_VIRTUALENV == FIRST

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4557
 2020-04-02 11:12:54 -04:00
Brad King
35d9ca268b Merge topic 'FindPython-fix-VIRTUALENV-eq-FIRST' 
81beb28752 FindPython: fix handling when FIND_VIRTUALENV == FIRST

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4557
 2020-04-02 11:12:54 -04:00
Marc Chevrier
81beb28752 FindPython: fix handling when FIND_VIRTUALENV == FIRST 
Fixes: #20525
 2020-04-01 10:36:46 -04:00
Marc Chevrier
dd0664415a FindPython: use 'sysconfig' as alternate to 'distutils.sysconfig' 
To support any python installation, if package 'distutils.sysconfig'
is not available, try to use package 'sysconfig'.

Fixes: #20502
 2020-03-28 10:51:47 +01:00
Brad King
83f5ba06df Merge topic 'FindPython-variable-spelling-error' 
63580668a8 FindPython: fix variable spelling error

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4529
 2020-03-27 07:44:12 -04:00
Marc Chevrier
63580668a8 FindPython: fix variable spelling error 2020-03-26 18:08:25 +01:00
Brad King
f2b4576373 Merge topic 'FindPython-polish' 
bf1ecfef7f FindPython: misc. fixes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4519
 2020-03-25 08:13:07 -04:00
Marc Chevrier
bf1ecfef7f FindPython: misc. fixes 
Help: Fix errors regardings HINTS.
Code: Optimize Python signature cache variable to avoid unecessary searchs.
 2020-03-24 18:26:16 +01:00
Brad King
3c7774e207 Merge topic 'FindPython-version-validation-fix' 
cc7f116cb4 FindPython: fix regression on version validation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4492
 2020-03-18 07:54:23 -04:00
Marc Chevrier
cc7f116cb4 FindPython: fix regression on version validation 
In commit 3dab4682f6 (FindPython: reduces consumption of resources,
2020-02-10, v3.17.0-rc1~11^2) we accidentally broke the python
executable version validation when the "LOCATION" strategy is used
with the plain `FindPython` module.  Fix the logic and add test
cases covering those combinations.

Fixes: #20465
 2020-03-17 10:08:34 -04:00
Brad King
3a49ea6f25 Merge topic 'FindPython-ENV-CMAKE_FRAMEWORK_PATH' 
1044776472 FindPython: Convert env CMAKE_FRAMEWORK_PATH to CMake path

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Marc Chevrier <marc.chevrier@gmail.com>
Merge-request: !4462
 2020-03-12 08:18:54 -04:00
Bo Anderson
1044776472 FindPython: Convert env CMAKE_FRAMEWORK_PATH to CMake path 2020-03-11 13:35:33 -04:00
Marc Chevrier
e5b4c74238 FindPython: Add possibility to control scope of artifacts. 
Fixes: #20362
 2020-03-05 16:44:48 +01:00
Marc Chevrier
0c97b73bc0 FindPython: python_add_library can now manage SOABI suffix. 
Fixes: #20408
 2020-03-03 13:13:48 +01:00
Marc Chevrier
1dc524f202 FindPython: Do not cache computed result variables in CMake 3.16 
Since commit 06d9e67fbd (FindPython: Add capability to specify directly
artifacts, 2019-08-15, v3.16.0-rc1~157^2) we accidentally add the result
variables `Python*_LIBRARY_RELEASE` and `Python*_LIBRARY_DEBUG` to the
cache.  They are always computed from other results and so should not be
presented to users in cmake-gui and ccmake to edit.

Issue: #20362
 2020-02-26 08:09:21 -05:00
Marc Chevrier
602d1d8201 FindPython: Mark non-public cache entries INTERNAL in CMake 3.16 
Since commit 06d9e67fbd (FindPython: Add capability to specify directly
artifacts, 2019-08-15, v3.16.0-rc1~157^2) we accidentally expose cache
entries named `_Python...` to users in cmake-gui and ccmake.  Mark those
entries as `INTERNAL` to hide them.

Issue: #20362
 2020-02-26 08:09:16 -05:00
Marc Chevrier
42c6a1bfee FindPython: Do not cache computed result variables 
Since commit 06d9e67fbd (FindPython: Add capability to specify directly
artifacts, 2019-08-15, v3.16.0-rc1~157^2) we accidentally add the result
variables `Python*_LIBRARY_RELEASE` and `Python*_LIBRARY_DEBUG` to the
cache.  They are always computed from other results and so should not be
presented to users in cmake-gui and ccmake to edit.

Issue: #20362
 2020-02-26 08:08:26 -05:00
Marc Chevrier
a7b4516e1a FindPython: Mark non-public cache entries INTERNAL 
Since commit 06d9e67fbd (FindPython: Add capability to specify directly
artifacts, 2019-08-15, v3.16.0-rc1~157^2) we accidentally expose cache
entries named `_Python...` to users in cmake-gui and ccmake.  Mark those
entries as `INTERNAL` to hide them.

Issue: #20362
 2020-02-26 08:08:03 -05:00
Marc Chevrier
3dab4682f6 FindPython: reduces consumption of resources 
Stores more information in the cache to reduce the number
of sub-processes required on subsequent find_package calls.

Fixes: #20337
 2020-02-10 12:41:04 +01:00
Brad King
513c7bf515 Merge topic 'python39' 
f6474214b3 FindPython: Add support for version 3.9

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Marc Chevrier <marc.chevrier@gmail.com>
Acked-by: Björn Esser <besser82@fedoraproject.org>
Merge-request: !4225
 2020-01-15 13:36:35 -05:00
Miro Hrončok
f6474214b3 FindPython: Add support for version 3.9 
Development versions of Python 3.9.0 are already out there.

See PEP 596 -- Python 3.9 Release Schedule:
https://www.python.org/dev/peps/pep-0596/
 2020-01-14 15:02:19 -05:00
Brad King
df1fad32ad Merge topic 'macOS-Xcode-11-frameworks' 
fcde42751a FindPython: ensure new Xcode framework for Python3 is detected
dd7b741b81 macOS: Add support for new Xcode 11 frameworks directory

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4198
 2020-01-13 10:20:59 -05:00
Marc Chevrier
fcde42751a FindPython: ensure new Xcode framework for Python3 is detected 2020-01-10 13:48:39 +01:00
Marc Chevrier
61502d3956 FindPython: Add variable Python_SOABI 
This variable holds the standard extension suffix for modules.

Fixes: #20150
 2020-01-09 14:43:22 +01:00
Marc Chevrier
417c533010 Merge topic 'findpython_conda_support' 
776d27d4a4 FindPython: Extend virtual environment handling by considering conda

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4155
 2019-12-23 06:33:54 -05:00
Sebastian Müller
776d27d4a4 FindPython: Extend virtual environment handling by considering conda 
- Add functionality to recognize and use CONDA_PREFIX environment variable
- Add tests for conda virtual environments
- Fixes: #20111
 2019-12-21 15:38:00 +01:00
Kyle Edwards
3e07995bdd Merge topic 'FindPython-Fix-target-properties' 
fe280e0cda FindPython*: Fix erroneous target properties setting

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kyle Edwards <kyle.edwards@kitware.com>
Merge-request: !4154
 2019-12-20 12:57:07 -05:00
Marc Chevrier
fe280e0cda FindPython*: Fix erroneous target properties setting 
Property IMPORTED_CONFIGURATIONS for targets Python*::Python
and Python*::Module is not correctly set.
 2019-12-19 19:42:24 +01:00
Marc Chevrier
687a354518 FindPython: customize failure message 2019-11-01 12:10:30 +01:00
Marc Chevrier
06d9e67fbd FindPython: Add capability to specify directly artifacts 
Fixes: #19492
 2019-09-02 17:20:53 +02:00