mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-03-11 03:50:43 -05:00
Code Issues Packages Projects Releases Wiki Activity
50,678 Commits 2 Branches 393 Tags
f4f3fca99fd4dc473fba31f17c5d09b8b6e2d1fb
Commit Graph

50678 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King
f4f3fca99f Merge topic 'android-root' 
cbc51a8be3 Android: restructure android search paths

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: huangqinjin <huangqinjin@gmail.com>
Merge-request: !5479
 2020-11-10 09:42:31 -05:00
Brad King
9321379d7e Merge branch 'release-3.19' 2020-11-10 09:40:54 -05:00
Brad King
781114e792 Merge topic 'python3.10' 
bb2ebbf241 FindPython{Interp,Libs}: Add support for version 3.10

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5482
 2020-11-10 09:40:54 -05:00
Brad King
0d182c02f6 Merge topic 'python3.10' into release-3.19 
bb2ebbf241 FindPython{Interp,Libs}: Add support for version 3.10

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5482
 2020-11-10 09:40:54 -05:00
Kitware Robot
cb5cf3f04d CMake Nightly Date Stamp 2020-11-10 00:01:10 -05:00
Miro Hrončok
bb2ebbf241 FindPython{Interp,Libs}: Add support for version 3.10 
Extend the change from commit 23cd98a66a (FindPython: Add support of
version 3.10, 2020-10-16, v3.19.0-rc2~25^2) to cover the legacy
`FindPython{Interp,Libs}` modules too.
 2020-11-09 11:44:13 -05:00
Brad King
b754896004 Merge topic 'doc-html-lang' into release-3.19 
f25e4313ac Utilities/Sphinx: Tell Sphinx that documentation is written in English

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5480
 2020-11-09 10:51:08 -05:00
Brad King
caed98d771 Merge branch 'release-3.19' 2020-11-09 10:51:08 -05:00
Brad King
3f60c92775 Merge topic 'doc-html-lang' 
f25e4313ac Utilities/Sphinx: Tell Sphinx that documentation is written in English

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5480
 2020-11-09 10:51:08 -05:00
Brad King
f25e4313ac Utilities/Sphinx: Tell Sphinx that documentation is written in English 
Fixes: #21409
 2020-11-09 10:15:35 -05:00
Haibo Huang
cbc51a8be3 Android: restructure android search paths 
1. Set CMAKE_FIND_ROOT_PATH unconditionally.

Revise the implementation from commit a7f41a7ee4 (Android: Fix find_*
search order within NDK for unified toolchains, 2020-10-13).  In the old
implementation, if people set CMAKE_FIND_ROOT_PATH, CMAKE_ANDROID_NDK
won't be added to find root. And all paths added to CMAKE_SYSTEM_*_PATH
below will be rerooted to the user specified root.

2. Add api level specific library path to CMAKE_SYSTEM_PREFIX_PATH.

As the discussion in [1], some people want the paths added by
UnixPaths.cmake. They install their libraries according to
GNUInstallDirs [2].

As a result, we cannot clear CMAKE_SYSTEM_PREFIX_PATH. It includes /usr
so no matter what we specify in CMAKE_SYSTEM_LIBRARY_PATH,
/usr/lib/<arch> will be searched first.

The author also pointed out a way to solve this issue [3]. In addition
to other paths, CMake also searches <root>/<prefix> [4]. So we can add
the API specific lib path to the beginning of CMAKE_SYSTEM_PREFIX_PATH,
to have it searched first.

[1] https://android-review.googlesource.com/c/platform/ndk/+/1486800
[2] https://cmake.org/cmake/help/latest/module/GNUInstallDirs.html
[3] https://github.com/android/ndk/issues/1179#issuecomment-613435081
[4] 11425041f0/Source/cmSearchPath.cxx (L202)
 2020-11-09 08:15:46 -05:00
Brad King
63a1917d09 Merge topic 'FindProtobuf-multiple-extensions' 
2bb3c0a44b FindProtobuf: Support files with multiple extensions (#18329)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5476
 2020-11-09 08:03:39 -05:00
Brad King
2b0a1180b0 Merge topic 'ninja-dyndep-refactor' 
941be1d356 cmNinjaTargetGenerator: Clarify variable names for preprocessing conditions
33a8e0bb09 cmNinjaTargetGenerator: Simplify scan rule depfile selection
bff1871c39 cmNinjaTargetGenerator: Generalize GetScanRule helper
9f60e8aa52 cmNinjaTargetGenerator: Remove redundant conditions for dyndep blocks
43fe7e0c97 cmNinjaTargetGenerator: Revise conditions to clarify dyndep code paths
1416012f2c cmNinjaTargetGenerator: Clarify scan rule code grouping
f2eec04728 cmNinjaTargetGenerator: Clarify scan rule helper functions
170cfc764d cmNinjaTargetGenerator: Drop unnecessary mutation
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5478
 2020-11-09 08:02:33 -05:00
Brad King
b1bc99d34a Merge topic 'TestBigEndian-use-abi-result' 
fcc89bda1d TestBigEndian: Re-implement using byte order detected from ABI check
412ce907a2 Tests: Prepare RunCMake.ABI cases to run more checks

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5477
 2020-11-09 08:01:37 -05:00
Brad King
d0391599a8 Merge topic 'android-flags' 
94d87afece Android: allow NDK to control cflags / ldflags
85e5139aba Android: Move *_LLVM_TRIPLE to the centralized table

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5461
 2020-11-09 07:58:49 -05:00
Kitware Robot
eb48859594 CMake Nightly Date Stamp 2020-11-09 00:01:10 -05:00
Kitware Robot
94be747920 CMake Nightly Date Stamp 2020-11-08 00:01:06 -05:00
Kitware Robot
ae488d025f CMake Nightly Date Stamp 2020-11-07 00:01:08 -05:00
Brad King
941be1d356 cmNinjaTargetGenerator: Clarify variable names for preprocessing conditions 
What is important about code paths for Fortran's explicit preprocessing
is that the compilation step following it does not do preprocessing.
 2020-11-06 11:51:02 -05:00
Brad King
33a8e0bb09 cmNinjaTargetGenerator: Simplify scan rule depfile selection 
The depfile can always be the first output of the build statement
with a `.d` suffix added.  This approach easily avoids conflicts.
 2020-11-06 11:50:38 -05:00
Brad King
bff1871c39 cmNinjaTargetGenerator: Generalize GetScanRule helper 
Allow the caller to provide any number of commands, and to choose which
ones get a launcher.
 2020-11-06 11:43:52 -05:00
Brad King
9f60e8aa52 cmNinjaTargetGenerator: Remove redundant conditions for dyndep blocks 
The GetScanCommand and GetScanBuildStatement helpers are called only in
code paths for dyndep.  Drop their checks for this condition.
 2020-11-06 11:43:52 -05:00
Brad King
43fe7e0c97 cmNinjaTargetGenerator: Revise conditions to clarify dyndep code paths 
All the scan-related code paths are actually about dyndep rather than
explicit preprocessing.  It just happens that the implementation for
Fortran requires explicit preprocessing.
 2020-11-06 11:43:52 -05:00
Brad King
1416012f2c cmNinjaTargetGenerator: Clarify scan rule code grouping 2020-11-06 11:43:52 -05:00
Brad King
f2eec04728 cmNinjaTargetGenerator: Clarify scan rule helper functions 
Revise names to clarify that these helpers are for the dependency
scanning commands, which may happen to preprocess.
 2020-11-06 11:43:52 -05:00
Brad King
170cfc764d cmNinjaTargetGenerator: Drop unnecessary mutation 
GetPreprocessScanRule's caller always has `vars.Source` set to `$in`.
 2020-11-06 11:43:52 -05:00
Brad King
fcf3fc4447 cmNinjaTargetGenerator: Clarify method names 2020-11-06 11:43:52 -05:00
Brad King
fe5d0849db cmNinjaTargetGenerator: Consolidate redundant methods 2020-11-06 11:43:51 -05:00
Brad King
a117101fbd Merge branch 'release-3.19' into master 2020-11-06 10:22:07 -05:00
Florian Franzen
2bb3c0a44b FindProtobuf: Support files with multiple extensions (#18329) 2020-11-06 15:40:54 +01:00
Brad King
7a04f45722 CMake 3.19.0-rc3 v3.19.0-rc3 2020-11-06 09:19:57 -05:00
Brad King
fcc89bda1d TestBigEndian: Re-implement using byte order detected from ABI check 
Document the module as deprecated in favor of the ABI check results.
 2020-11-06 09:17:30 -05:00
Brad King
412ce907a2 Tests: Prepare RunCMake.ABI cases to run more checks 2020-11-06 08:33:03 -05:00
Brad King
ffda92d4bf Merge topic 'clang-tidy-for-objc' 
1134064e22 clang-tidy: allow OBJC and OBJCXX

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5467
 2020-11-06 08:05:00 -05:00
Brad King
cc2d849e69 Merge topic 'cmprop-improve' 
f6e7d5f3a0 Reduce the scope of temporary cmProp variables and other improvements

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5471
 2020-11-06 08:04:26 -05:00
Brad King
7b6a9ac8e7 Merge topic 'android-build-type' 
3dae826e43 Android: default to RelWithDebInfo

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5465
 2020-11-06 08:03:27 -05:00
Brad King
5696be33a6 Merge topic 'FindICU-naming' 
21cb588629 FindICU: Correct variable names to match documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5451
 2020-11-06 08:02:30 -05:00
Brad King
02d6c98210 Merge topic 'cpack-nuget' 
41ae7c4e51 CPack/NuGet: Add settings for the license, icon, and language

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5415
 2020-11-06 08:01:41 -05:00
Brad King
3a69c7779a Merge branch 'release-3.19' 2020-11-06 07:58:55 -05:00
Brad King
e0438b05de Merge topic 'apple-v4-tbd-file-arch-lookup' 
4c6797e03e Apple: Update SDK architecture detection for tbd file version 4

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5470
 2020-11-06 07:58:55 -05:00
Brad King
b80e39d0f6 Merge topic 'apple-v4-tbd-file-arch-lookup' into release-3.19 
4c6797e03e Apple: Update SDK architecture detection for tbd file version 4

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5470
 2020-11-06 07:58:54 -05:00
Brad King
2e86b0ec51 Merge branch 'release-3.19' 2020-11-06 07:57:51 -05:00
Brad King
dd8c91a4f3 Merge topic 'cmake-gui-file-dialog-crash' into release-3.19 
5f782119c8 cmake-gui: Restore workaround for crash in file dialog

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5472
 2020-11-06 07:57:51 -05:00
Brad King
a0453a7f0c Merge topic 'cmake-gui-file-dialog-crash' 
5f782119c8 cmake-gui: Restore workaround for crash in file dialog

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5472
 2020-11-06 07:57:51 -05:00
Brad King
d1039f74a9 Merge branch 'release-3.19' 2020-11-06 07:55:48 -05:00
Brad King
b065b1ad09 Merge topic 'FindPostgreSQL-13' 
f3f09f1c96 FindPostgreSQL: support version 13

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5468
 2020-11-06 07:55:48 -05:00
Brad King
0adaed609f Merge topic 'FindPostgreSQL-13' into release-3.19 
f3f09f1c96 FindPostgreSQL: support version 13

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5468
 2020-11-06 07:55:47 -05:00
Brad King
2b2ca47eda Merge branch 'release-3.19' 2020-11-06 07:43:03 -05:00
Brad King
a775a6a18b Merge topic 'xcode-inherit-paths' into release-3.19 
bffb17be3d Xcode: Inherit target library and framework search paths from project

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5463
 2020-11-06 07:43:03 -05:00
Brad King
b2552d50da Merge topic 'xcode-inherit-paths' 
bffb17be3d Xcode: Inherit target library and framework search paths from project

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5463
 2020-11-06 07:43:03 -05:00