1
0
mirror of https://github.com/Kitware/CMake.git synced 2025-10-14 02:08:27 +08:00
Commit Graph

51319 Commits

Author SHA1 Message Date
Ben McMorran
bb069c0857 cmFileAPI: Add "toolchains" object kind.
Fixes #19514
2021-01-12 11:21:19 -08:00
Brad King
1c9b61c23e Merge branch 'release-3.19' 2021-01-06 14:08:28 -05:00
Brad King
3734a96d98 Merge topic 'FindHDF5-dbg-and-rel'
5267ba9d63 FindHDF5: Fix finding both debug and release libs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5653
2021-01-06 14:08:27 -05:00
Brad King
95e3ff2e88 Merge topic 'FindHDF5-dbg-and-rel' into release-3.19
5267ba9d63 FindHDF5: Fix finding both debug and release libs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5653
2021-01-06 14:08:27 -05:00
Brad King
94047141b0 Merge branch 'release-3.19' 2021-01-06 13:49:33 -05:00
Brad King
6fc45f0282 Merge topic 'ci-xcode-12.3' into release-3.19
7b4a50d622 gitlab-ci: update macOS jobs to use Xcode 12.3

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5670
2021-01-06 13:49:32 -05:00
Brad King
a24de5c59a Merge topic 'ci-xcode-12.3'
7b4a50d622 gitlab-ci: update macOS jobs to use Xcode 12.3

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5670
2021-01-06 13:49:32 -05:00
Brad King
7b4a50d622 gitlab-ci: update macOS jobs to use Xcode 12.3 2021-01-06 12:47:02 -05:00
Brad King
91f0f4aa73 Merge topic 'explicit-this-fix'
209daa20b2 Code style: add missed explicit 'this->'

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5400
2021-01-06 10:20:57 -05:00
Brad King
c1a7de72e1 Merge topic 'depend_make_refine'
b696f78073 cmDepends: merge dependers of depend makefile

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5631
2021-01-06 10:20:04 -05:00
Brad King
6493d37091 Merge topic 'update-kwsys'
b6ae9ddc41 Merge branch 'upstream-KWSys' into update-kwsys
3887390a37 KWSys 2021-01-05 (a72d59e1)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5665
2021-01-06 10:19:10 -05:00
Kitware Robot
3b36d12ac2 CMake Nightly Date Stamp 2021-01-06 00:01:12 -05:00
Brad King
ce8bb12f72 Merge branch 'release-3.19' 2021-01-05 09:03:08 -05:00
Brad King
98084f902b Merge topic 'FindMPI-oneapi-single-quotes'
a5b223aa7f FindMPI: remove single quotes from include path

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5654
2021-01-05 09:03:08 -05:00
Brad King
d0e3408d8b Merge topic 'FindMPI-oneapi-single-quotes' into release-3.19
a5b223aa7f FindMPI: remove single quotes from include path

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5654
2021-01-05 09:03:07 -05:00
Brad King
522015e04f Merge topic 'java-export-native_headers'
53235626a2 UseJava: enable exportation of native headers target

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5658
2021-01-05 09:02:12 -05:00
Brad King
78c95e5a1c Merge topic 'ninja-omit-empty-custom-command'
d43f4692e0 Ninja: Omit custom commands with an empty COMMAND

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5647
2021-01-05 09:01:12 -05:00
Kai Wang
b696f78073 cmDepends: merge dependers of depend makefile
Since one depender has multiple dependees, depend makefile generated
same depender line by line, to reduce file size and refine make file
parse speed, merge same dependers to one. And add a testcase for
large depend.make which generated source file includes 20000 header
files and run build and incremental build

Signed-off-by: Wangkai <wangkai86@huawei.com>
Signed-off-by: Zhaoyingdong <zhaoyingdong@huawei.com>
2021-01-05 07:48:27 -05:00
Oleksandr Koval
209daa20b2 Code style: add missed explicit 'this->'
CMake uses explicit 'this->' style. Using custom clang-tidy check we can
detect and fix places where 'this->' was missed.
2021-01-05 14:32:36 +02:00
Brad King
b6ae9ddc41 Merge branch 'upstream-KWSys' into update-kwsys
# By KWSys Upstream
* upstream-KWSys:
  KWSys 2021-01-05 (a72d59e1)
2021-01-05 06:56:08 -05:00
KWSys Upstream
3887390a37 KWSys 2021-01-05 (a72d59e1)
Code extracted from:

    https://gitlab.kitware.com/utils/kwsys.git

at commit a72d59e12fcfcce1a88456effb6543bf3cd20dc9 (master).

Upstream Shortlog
-----------------

Dylan Fan (1):
      e6cc4679 SystemInformation: Add Zhaoxin x86 processor
2021-01-05 06:56:02 -05:00
Kitware Robot
764ce15ffb CMake Nightly Date Stamp 2021-01-05 00:01:12 -05:00
Kris Thielemans
5267ba9d63 FindHDF5: Fix finding both debug and release libs
Use `target_link_libraries` to set `INTERFACE_LINK_LIBRARIES` so that
the `debug` and `optimized` keywords work.

In commit a8e0a6b3e4 (FindHDF5: Port changes from VTK, 2020-06-10,
v3.19.0-rc1~312^2~1) we added use of `HDF5_LIBRARIES`, but the value may
contain `debug` and `optimized` keywords.

Fixes: #21637
2021-01-04 14:26:38 -05:00
Eduard Valeyev
a5b223aa7f FindMPI: remove single quotes from include path
Intel OneAPI's MPI wraps include paths into single quotes,
remove them when sanitizing _MPI_INCLUDE_PATH

Fixes: #21634
2021-01-04 14:13:43 -05:00
Brad King
5dafe89650 Merge topic 'posix-test-command'
d9a788b356 bootstrap: test -a|o is not POSIX

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !5650
2021-01-04 13:50:46 -05:00
Brad King
4d70299c66 Merge topic 'clang_win32_subsystem'
acfb54bb2f Clang: Support WIN32_EXECUTABLE

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5648
2021-01-04 13:49:23 -05:00
Brad King
1883ef1cda Merge topic 'tests-bump-minver'
72e7c45e98 Tests: Bump CMake minimum required in tests to 2.8.12

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5644
2021-01-04 13:48:38 -05:00
Brad King
eb14fff1ca Merge topic 'emacs-mode-not-char'
3987db59c5 cmake-mode.el: Fix rx usage for Emacs 26

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Przemyslaw Kryger <pkryger@gmail.com>
Acked-by: Jostein Kjønigsen <jostein@kjonigsen.net>
Merge-request: !5657
2021-01-04 13:31:11 -05:00
Brad King
49cec642af Merge topic 'tutorial-typo'
b42a63605c Tutorial: Fix minor typo in index.rst

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5662
2021-01-04 13:30:18 -05:00
fazl
b42a63605c Tutorial: Fix minor typo in index.rst
s/mqsqrt.h/mysqrt.h/
2021-01-04 12:02:09 -05:00
marciosmiderle
3987db59c5 cmake-mode.el: Fix rx usage for Emacs 26
The change in commit 901386f646 (cmake-mode.el: Add navigation by
function and macro, 2020-12-11) introduced a regression.  Emacs 26 could
not load cmake-mode.el anymore.  Use `(not-char ")")`, not `(not ")")`.
2021-01-04 11:36:41 -05:00
Kitware Robot
f1ca52d48e CMake Nightly Date Stamp 2021-01-04 00:01:12 -05:00
Kitware Robot
338778989d CMake Nightly Date Stamp 2021-01-03 00:01:07 -05:00
Kitware Robot
76c1ee7f16 CMake Nightly Date Stamp 2021-01-02 00:01:07 -05:00
Kitware Robot
d6d67ba6c3 CMake Nightly Date Stamp 2021-01-01 00:01:07 -05:00
Kitware Robot
990692bb3f CMake Nightly Date Stamp 2020-12-31 00:01:10 -05:00
Brad King
b30243d9fd Merge topic 'copyright-year'
6ad7e88314 Copyright.txt: Update year range to end in 2021

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5652
2020-12-30 07:29:10 -05:00
Kitware Robot
8d33e8672b CMake Nightly Date Stamp 2020-12-30 00:01:06 -05:00
Marc Chevrier
53235626a2 UseJava: enable exportation of native headers target 2020-12-29 17:14:20 +01:00
Kitware Robot
c2a8d9b94e CMake Nightly Date Stamp 2020-12-29 00:01:09 -05:00
Kitware Robot
6b1adada4c CMake Nightly Date Stamp 2020-12-28 00:01:18 -05:00
Kitware Robot
da2474626b CMake Nightly Date Stamp 2020-12-27 00:01:08 -05:00
Marc Chevrier
f5cdcd0606 Merge topic 'makefiles-custom_command-depfile'
3eacf857e3 Tests: Add case for DEPFILE in add_custom_command
cfd8a5ac1f Makefiles: Add support of DEPFILE for add_custom_command
a526f71266 cmGccDepfileReader: Add new function ensuring paths are valid

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5617
2020-12-26 05:55:55 -05:00
Kitware Robot
fb6b2042f2 CMake Nightly Date Stamp 2020-12-26 00:01:07 -05:00
Kitware Robot
0e08a8552a CMake Nightly Date Stamp 2020-12-25 00:01:07 -05:00
Kitware Robot
67fe67248c CMake Nightly Date Stamp 2020-12-24 00:01:10 -05:00
Craig Scott
ef5b3eff4e Merge topic 'xcode-inherit-paths'
5115e8b2b6 Xcode: Generalize inheritance of project-level search paths
6b6230b23b cmGlobalXCodeGenerator: Factor out helper to append attribute

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5637
2020-12-23 19:11:21 -05:00
Brad King
6ad7e88314 Copyright.txt: Update year range to end in 2021 2020-12-23 14:31:37 -05:00
Issam E. Maghni
d9a788b356 bootstrap: test -a|o is not POSIX 2020-12-23 13:27:33 -05:00
Shannon Booth
d43f4692e0 Ninja: Omit custom commands with an empty COMMAND
Fixes: #21063
2020-12-23 09:59:03 -05:00