mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-03 21:00:01 -05:00
Code Issues Packages Projects Releases Wiki Activity
53,050 Commits 2 Branches 401 Tags
bf35f3848a95c1dbebe09f2f1fca6ba4635b5aec
Commit Graph

53050 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kitware Robot 4cab7a6fc5 CMake Nightly Date Stamp 2021-05-06 00:01:10 -04:00
Brad King 71665c8cb9 gitlab-ci: Clarify conditions enabling jobs for continuous build of stage 2021-05-05 15:25:35 -04:00
Robert Maynard 2c9e623e31 Find{BLAS,LAPACK}: Add support for the NVHPC LAPACK library 2021-05-05 12:04:32 -04:00
Amine Najahi f3f57cc4ed NMake: Use UTF-8 with BOM if supported by nmake 
Fixes: #21792
 2021-05-05 10:56:49 -04:00
Brad King 186c9bff53 NMake: Check nmake version for support of UTF-8 
NMake version 9 and above support UTF-8 encoded makefiles with a BOM.
 2021-05-05 10:56:49 -04:00
Brad King 8a4f536be6 NMake: Detect nmake version 
Run `nmake -?` and extract the version from its output.
Use a timeout because Watcom tools come with a `nmake` tool
that always waits for user input on `-?`.
 2021-05-05 10:55:55 -04:00
Brad King 5972094708 ObjectiveC: Respect OSX_ARCHITECTURES for OBJC 
Fix a typo from commit 940fc62962 (macOS: Respect OSX_ARCHITECTURES for
ASM, 2020-08-21, v3.19.0-rc1~270^2).

Fixes: #22152
 2021-05-05 10:45:01 -04:00
KWSys Upstream 04c6e736f6 KWSys 2021-05-05 (e9ca4104) 
Code extracted from:

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

at commit e9ca4104e816c28e3fcf94ce69fd75ca9498f4a7 (master).

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

Ben Boeckel (1):
      99ffa991 cmake: clear some configure checks when the deployment target changes

Martin Willers (2):
      bbf6cdef Terminal: Simplify CLICOLOR_FORCE check
      f308fcfb Terminal: Disable color output when CLICOLOR is set to 0
 2021-05-05 10:17:30 -04:00
Brad King 4b73f113ba Merge branch 'upstream-KWSys' into update-kwsys 
# By KWSys Upstream
* upstream-KWSys:
  KWSys 2021-05-05 (e9ca4104)
 2021-05-05 10:17:30 -04:00
Brad King fa16b462f1 Tests: Fix RunCMake.CMakePresets example PATH format 
Since commit 94c955e508 (Tests: Test the CMakePresets.json example in
the documentation, 2020-10-09, v3.19.0-rc1~8^2) we transform the
documented preset example for testing by replacing the generator.
Extend the transformation with a step to fix `PATH` env var syntax.
 2021-05-05 10:13:35 -04:00
Brad King 41f9486e61 Merge topic 'generate-cmake-build-command-parallel' 
d2b856bc92 ctest_build: Add the PARALLEL_LEVEL argument
fc2ac46043 build_command: Add the PARALLEL_LEVEL argument
4dd4e9dd6c cmGlobalGenerator: Add parallel parameter to GenerateCMakeBuildCommand

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Brad King <brad.king@kitware.com>
Merge-request: !6069
 2021-05-05 10:11:46 -04:00
Brad King 7973f97828 Merge topic 'doc-tls' 
7398993f5b Help: Document CMAKE_TLS_VERIFY variable explicitly

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6064
 2021-05-05 10:08:45 -04:00
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
Danny Parker dfaf55fbfd Xcode: add extra '$(inherited)' entries using InheritBuildSettingAttribute. 
These have been added to:
GCC_PREPROCESSOR_DEFINITIONS
OTHER_CFLAGS
OTHER_LDFLAGS

This is to allow Cocoapods to work correctly as it uses xcconfig files to alter build settings in Xcode, and requires these build settings to inherit from their parent, not overwrite.
 2021-05-05 14:38:33 +01:00
Kitware Robot de0c8b4d98 CMake Nightly Date Stamp 2021-05-05 00:01:07 -04:00
friendlyanon d2b856bc92 ctest_build: Add the PARALLEL_LEVEL argument 
Fixes: #19712
 2021-05-04 20:30:18 +02:00
friendlyanon fc2ac46043 build_command: Add the PARALLEL_LEVEL argument 
Issue: #19712
 2021-05-04 20:17:17 +02: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
Michael Hirsch 7398993f5b Help: Document CMAKE_TLS_VERIFY variable explicitly 
Previously it was mentioned only in the `file` and `ExternalProject`
documentation.
 2021-05-04 12:29:13 -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