mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-06 14:19:59 -05:00
Code Issues Packages Projects Releases Wiki Activity
52,933 Commits 2 Branches 401 Tags
06d103889c641ce72f4d7e239eddb0a145a324f0
Commit Graph

52933 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King 06d103889c Merge topic 'clang-ipo-support' 
3dd776ccfd Windows-Clang: Support duplicate object names in LTO archives

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6082
 2021-05-05 10:07:26 -04:00
Brad King 2773173f90 Merge branch 'release-3.20' 2021-05-05 10:06:03 -04:00
Brad King 4ff6c5e34c Merge topic 'binutils-var-private' 
c33fb2e664 BinUtils: Use more-private temporary variable names

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6085
 2021-05-05 10:06:03 -04:00
Brad King 084767a9ce Merge topic 'binutils-var-private' into release-3.20 
c33fb2e664 BinUtils: Use more-private temporary variable names

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6085
 2021-05-05 10:06:02 -04:00
Kitware Robot de0c8b4d98 CMake Nightly Date Stamp 2021-05-05 00:01:07 -04:00
Brad King c33fb2e664 BinUtils: Use more-private temporary variable names 
Since commit 4d786dfcfa (BinUtils: Avoid clobbering a variable named
without a private prefix, 2021-04-06, v3.20.1~4^2) we use variables
named `_tool` and `_name`, but these may still be common enough to
affect project code.  Use `_CMAKE_TOOL` and `_CMAKE_TOOL_NAME` instead,
and unset them when finished.

Fixes: #22140
 2021-05-04 12:44:14 -04:00
Brad King d4529b7e6e Merge topic 'doc-review' 
b82052feb8 Help/dev/review: Clarify instructions to update existing merge requests

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6073
 2021-05-04 12:31:57 -04:00
Brad King 09f2f5df89 Merge topic 'extend_toolchain_flag_to_cmake_preset' 
a9b968bb98 cmake-presets: Introduce `toolchainFile` preset option

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6045
 2021-05-04 11:54:49 -04:00
Brad King abc78a3557 Merge topic 'mingw-archive-no-replace' 
e8f0b75ff9 Windows-GNU: Support duplicate object names when linking shared libraries

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6081
 2021-05-04 11:30:38 -04:00
Brad King b78d312de6 Merge topic 'findswig-clean' 
229dd42158 Change find_path scope and add quotes
ff6f7b232f FindSWIG: reduce calls to SWIG exe, and clean up variables

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6075
 2021-05-04 11:28:33 -04:00
Brad King 8314edd065 Merge topic 'vs-config-specific-csproj' 
d8786bfa16 VS: Add support for per-config C# sources

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6055
 2021-05-04 11:27:43 -04:00
Brad King a0594739d1 Merge topic 'useswig-includes' 
d2296cdaab UseSWIG: remove duplicate target includes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6074
 2021-05-04 11:26:51 -04:00
Brad King 3e86fc40ac Merge topic 'vs-csharp-link' 
31bbcd1905 VS: Fix CSharp sources inside build directory

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6065
 2021-05-04 11:25:33 -04:00
Brad King 79427dccc2 Merge topic 'FindBLAS-mkl-omp' 
20ab504591 FindBLAS: Do not statically link against iomp5 in the case of Intel MKL

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6001
 2021-05-04 11:23:11 -04:00
Brad King 415f7b981d Merge topic 'ci-intel-compiler' 
8f03c24bfc gitlab-ci: add jobs testing Intel 2021.2.0 compilers on Linux

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6079
 2021-05-04 11:21:43 -04:00
Brad King 7e31edee22 Merge topic 'compile-features-lang-vars' 
bd16a985fc CompilerId/Features: Tolerate variables named for languages

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Timothy Brackett <brackett.tc@gmail.com>
Merge-request: !6060
 2021-05-04 11:20:39 -04:00
Brad King f060e6e556 Merge branch 'release-3.20' 2021-05-04 11:15:21 -04:00
Brad King d31b6657a6 Merge topic 'doc-preset-schema-relative' 
75dadc4558 Help: Use relative path for IDE Integration guide link to preset schema

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kyle Edwards <kyle.edwards@kitware.com>
Merge-request: !6083
 2021-05-04 11:15:21 -04:00
Brad King 38868b47f7 Merge topic 'doc-preset-schema-relative' into release-3.20 
75dadc4558 Help: Use relative path for IDE Integration guide link to preset schema

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kyle Edwards <kyle.edwards@kitware.com>
Merge-request: !6083
 2021-05-04 11:15:20 -04:00
Kitware Robot 576a07059e CMake Nightly Date Stamp 2021-05-04 00:01:08 -04:00
Brad King 75dadc4558 Help: Use relative path for IDE Integration guide link to preset schema 
This allows the integration guide to build as part of a larger set of
documentation.
 2021-05-03 15:36:45 -04:00
Brad King 3dd776ccfd Windows-Clang: Support duplicate object names in LTO archives 
Update the archive rules added by commit 6e3655db2c (Clang: add LTO
support for GNU-command line clang on windows, 2019-07-08,
v3.16.0-rc1~161^2~3) to match the `ar` convention we use for normal
archives.

Issue: #21988
 2021-05-03 14:37:20 -04:00
Brad King e8f0b75ff9 Windows-GNU: Support duplicate object names when linking shared libraries 
Extend the change from commit 39d0ade07e (Windows-GNU: Support duplicate
object names in large archives (#14874), 2014-04-14, v3.1.0-rc1~629^2~1)
to apply to the temporary archive we create for linking shared libraries
with MinGW tools.

Issue: #21988
 2021-05-03 14:29:26 -04:00
Brad King 8f03c24bfc gitlab-ci: add jobs testing Intel 2021.2.0 compilers on Linux 2021-05-03 13:33:25 -04:00
Seth R Johnson 229dd42158 Change find_path scope and add quotes 2021-05-03 13:30:32 -04:00
Smit tay b82052feb8 Help/dev/review: Clarify instructions to update existing merge requests 2021-05-03 12:15:27 -04:00
Kinan Mahdi 31bbcd1905 VS: Fix CSharp sources inside build directory 
Fixes: #22104
 2021-05-03 11:25:42 -04:00
Brad King 4e5893b658 Merge branch 'release-3.20' 2021-05-03 10:53:50 -04:00
Brad King 4419b944fd Merge topic 'ninja-multi-long-command-line-config' 
ad08f93ee4 Ninja Multi-Config: Split long command lines by config

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6067
 2021-05-03 10:53:50 -04:00
Brad King b6a5572d8a Merge topic 'ninja-multi-long-command-line-config' into release-3.20 
ad08f93ee4 Ninja Multi-Config: Split long command lines by config

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6067
 2021-05-03 10:53:49 -04:00
Thomas Vaughan d8786bfa16 VS: Add support for per-config C# sources 
Fixes: #22108
 2021-05-03 10:49:47 -04:00
Brad King bd16a985fc CompilerId/Features: Tolerate variables named for languages 
If a `CMakeLists.txt` or `CMAKE_TOOLCHAIN_FILE` sets a variable named
`C`, `CXX`, or `CUDA`, we were previously comparing each enabled
language name to the value of that variable, rather than the name
itself.  Double-quote the string to take advantage of policy `CMP0054`,
but also add "x" prefixes to support projects that do not set the
policy.

Fixes: #22125
 2021-05-03 10:22:23 -04:00
Brad King 4df3f5300a Merge topic 'foreach-loop-variable' 
46896d98bb foreach(): loop variables are only available in the loop scope

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Acked-by: Michael Hirsch <michael@scivision.dev>
Merge-request: !6044
 2021-05-03 09:59:35 -04:00
Brad King ec6ba9a3b8 Merge topic 'update-kwsys' 
11cadc3ef7 Merge branch 'upstream-KWSys' into update-kwsys
18513fa118 KWSys 2021-04-29 (5655d533)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6063
 2021-05-03 09:58:49 -04:00
Kitware Robot 8095cdd8c0 CMake Nightly Date Stamp 2021-05-03 00:01:14 -04:00
Seth R Johnson ff6f7b232f FindSWIG: reduce calls to SWIG exe, and clean up variables 
If all SWIG cache variables (EXECUTABLE, DIR, VERSION) are set,
there should be no need to invoke the SWIG exe on a reconfigure. This
changeset reduces the number of calls to the SWIG executable, and
additonially prevents temporary `SWIG_xxx` values from propagating outside
the `find_package` call.

I also refactored the conditionals to be less nested (and thus more
predictable), including changing theh definition of SWIG_USE_FILE to
reflect that it's if and only if SWIG_FOUND is trure.
 2021-05-02 10:05:44 -04:00
Seth R Johnson d2296cdaab UseSWIG: remove duplicate target includes 2021-05-02 09:17:57 -04:00
Kitware Robot 4f88cb1675 CMake Nightly Date Stamp 2021-05-02 00:01:06 -04:00
Kitware Robot a51ad60687 CMake Nightly Date Stamp 2021-05-01 00:01:06 -04:00
Kyle Edwards ad08f93ee4 Ninja Multi-Config: Split long command lines by config 
Fixes: #22123
 2021-04-30 14:46:21 -04:00
Kitware Robot 4b60072620 CMake Nightly Date Stamp 2021-04-30 00:01:09 -04:00
Eisuke Kawashima 20ab504591 FindBLAS: Do not statically link against iomp5 in the case of Intel MKL 
fix #21811
 2021-04-30 08:38:41 +09:00
Brad King 137125ffff Merge branch 'release-3.20' 2021-04-29 10:55:32 -04:00
Brad King 1ad4501ae9 CMake 3.20.2 v3.20.2 2021-04-29 09:53:54 -04:00
Brad King 11cadc3ef7 Merge branch 'upstream-KWSys' into update-kwsys 
# By KWSys Upstream
* upstream-KWSys:
  KWSys 2021-04-29 (5655d533)
 2021-04-29 09:45:42 -04:00
KWSys Upstream 18513fa118 KWSys 2021-04-29 (5655d533) 
Code extracted from:

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

at commit 5655d533a9a4fb59b87d364c896339f1d454d420 (master).

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

Brad King (1):
      6e59fd94 Process: Suppress NVHPC warning in FD_ZERO
 2021-04-29 09:45:42 -04:00
Brad King 9edff7f43e Merge topic 'remove_bad_install_dir_schema_docs' 
306db0fdb8 cmake-presets: Remove incorrect documentation for `installDir`

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6051
 2021-04-29 09:23:24 -04:00
Brad King d94f8516ab Merge topic 'find-msys' 
990b370401 FindMsys: Add a module to find MSYS and some bundled packages

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6057
 2021-04-29 09:22:27 -04:00
Brad King e2ac92681c Merge topic 'nvhpc-warnings' 
f881b4e4cc cmCPackDebGenerator: Remove unused local variable
5ad8862318 Source: Convince NVHPC that RAII variables are used
1898f9dd82 cmFileCommand: Remove unused local variable
6a003c6f35 cmSystemTools: Avoid unreachable code warning on NVHPC
16275c7f82 LexerParser: Suppress NVHPC warnings in generated code
cefda16d35 LexerParser: Regenerate parsers with bison 3.7.5

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6049
 2021-04-29 09:21:37 -04:00
Brad King c4f8c82358 Merge topic 'test-ifort-windows' 
82470e24ae Tests: Fix FortranOnly test with Intel compiler on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6058
 2021-04-29 09:20:45 -04:00