mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-20 21:28:23 -05:00
Code Issues Packages Projects Releases Wiki Activity
51,572 Commits 2 Branches 399 Tags
bdf30bdad8dfad258bbc8d387a91f66bee3d0c0f
Commit Graph

51572 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rodolfo Lima bdf30bdad8 CPack: add CPACK_THREADS variable to control compression threads 
This allows setting how many threads the compressor will use.
Currently only implemented for XZ when using system's lzma library.

Fixes: #21715
 2021-01-26 16:23:37 +01:00
Rodolfo Lima bcdb5b52a0 libarchive: Fix lzma_stream_encoder_mt detection 
The test for lzma_stream_encoder_mt was always failing
because the lzma libraries weren't being used by linker.
 2021-01-26 16:23:37 +01:00
Brad King 1380e611e1 Merge topic 'nmc-cache-targets' 
ccbedb80e4 Ninja Multi-Config: Restore rebuild_cache and edit_cache targets
6fdbe9201f cmNinjaUtilityTargetGenerator: Remove leftover development comment

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5740
 2021-01-26 09:09:18 -05:00
Brad King bd29de1a91 Merge topic 'cm-optional-warning' 
b7d4ee23d8 cm::optional: Fix `-Wunused-parameter` warnings in comparison operators

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kyle Edwards <kyle.edwards@kitware.com>
Merge-request: !5739
 2021-01-26 09:08:39 -05:00
Brad King 9792c7df4e Merge topic 'irsl-msvc-arm64' 
9c5cf0c1af IRSL: Add support for non-x86/x64 architectures such as arm64

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5733
 2021-01-26 09:03:13 -05:00
Brad King 5d31e7a25d Merge topic 'csharp-vs-v142-flags' 
ee78391c09 CSharp: Add 'warnaserror:...' to v142 flag table for VS
e38997d85a CSharp: Add 'debug:portable' to v142 flag table for VS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5735
 2021-01-26 09:02:25 -05:00
Brad King cad804e2c4 Merge topic 'update-kwsys' 
1bd1f96f3f Merge branch 'upstream-KWSys' into update-kwsys
4faaa079e3 KWSys 2021-01-25 (10e36d47)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Martin Storsjö <martin@martin.st>
Merge-request: !5736
 2021-01-26 09:01:28 -05:00
Brad King a5124f6bad Merge topic 'reproducible-unity-id' 
ee9da76972 Unity: Generate reproducible unity IDs for anonymous namespaces

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5727
 2021-01-26 09:00:28 -05:00
Kitware Robot 6b50138ae6 CMake Nightly Date Stamp 2021-01-26 00:01:10 -05:00
Brad King ccbedb80e4 Ninja Multi-Config: Restore rebuild_cache and edit_cache targets 
Since commit dcf9f4d2f7 (Ninja Multi-Config: Add support for
cross-config custom commands, 2020-12-09) we were not generating these
targets.  Restore them and add a test.

Fixes: #21722
 2021-01-25 15:22:53 -05:00
Brad King 6fdbe9201f cmNinjaUtilityTargetGenerator: Remove leftover development comment 2021-01-25 15:11:48 -05:00
Brad King b7d4ee23d8 cm::optional: Fix -Wunused-parameter warnings in comparison operators 2021-01-25 14:44:09 -05:00
Francois Keith ee78391c09 CSharp: Add 'warnaserror:...' to v142 flag table for VS 
This allows listing the warnings that must be flagged as errors.
For example:

    target_compile_options(proj PRIVATE "/warnaserror:1998,4014")
 2021-01-25 12:32:30 -05:00
Francois Keith e38997d85a CSharp: Add 'debug:portable' to v142 flag table for VS 2021-01-25 12:32:21 -05:00
pastdue 9c5cf0c1af IRSL: Add support for non-x86/x64 architectures such as arm64 
Implement `CMAKE_MSVC_ARCH` determination for more architectures.

Fixes: #16734
 2021-01-25 12:15:43 -05:00
Brad King 4f9228a300 Merge branch 'release-3.19' 2021-01-25 11:40:50 -05:00
Brad King 2ea4f390c1 Merge topic 'doc-multi-config-prop' 
1d7daa668c Help: Add Ninja Multi-Config to list in GENERATOR_IS_MULTI_CONFIG

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kyle Edwards <kyle.edwards@kitware.com>
Merge-request: !5737
 2021-01-25 11:40:50 -05:00
Brad King 6cc6d464e1 Merge topic 'doc-multi-config-prop' into release-3.19 
1d7daa668c Help: Add Ninja Multi-Config to list in GENERATOR_IS_MULTI_CONFIG

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kyle Edwards <kyle.edwards@kitware.com>
Merge-request: !5737
 2021-01-25 11:40:50 -05:00
Brad King 28c2d6bdd0 Merge branch 'release-3.19' 2021-01-25 11:40:14 -05:00
Brad King 016c71c681 Merge topic 'intel-fortran-nofor-main' 
2a5955ac09 Intel: Replace deprecated Fortran flag -nofor_main with -nofor-main

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5729
 2021-01-25 11:40:14 -05:00
Brad King 4ed5af7a3c Merge topic 'intel-fortran-nofor-main' into release-3.19 
2a5955ac09 Intel: Replace deprecated Fortran flag -nofor_main with -nofor-main

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5729
 2021-01-25 11:40:13 -05:00
Brad King adaa393115 Merge topic 'cpack-deb-shlibdeps-private-search-dirs' 
d586a4ad60 CPackDeb: dpkg-shlibdeps now supports searching for private shared libs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5718
 2021-01-25 11:39:39 -05:00
Brad King 1d7daa668c Help: Add Ninja Multi-Config to list in GENERATOR_IS_MULTI_CONFIG 
Fixes: #21739
 2021-01-25 10:52:49 -05:00
Brad King 1bd1f96f3f Merge branch 'upstream-KWSys' into update-kwsys 
# By KWSys Upstream
* upstream-KWSys:
  KWSys 2021-01-25 (10e36d47)
 2021-01-25 10:06:13 -05:00
KWSys Upstream 4faaa079e3 KWSys 2021-01-25 (10e36d47) 
Code extracted from:

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

at commit 10e36d47415840a0318331733460183152a0feb9 (master).

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

Martin Storsjö (1):
      fca5ad3a Process: Fix execute error handling re working dir on windows
 2021-01-25 10:06:13 -05:00
Kitware Robot 902f0c59fd CMake Nightly Date Stamp 2021-01-25 00:01:30 -05:00
Craig Scott 72974fe339 Merge topic 'doc-xcode-attr' 
3c80666f00 Help: Document intended purpose of XCODE_ATTRIBUTE_<an-attribute>

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5726
 2021-01-24 03:26:35 -05:00
Kitware Robot 1bfe5102b2 CMake Nightly Date Stamp 2021-01-24 00:01:08 -05:00
Kitware Robot 0bfb0edc8e CMake Nightly Date Stamp 2021-01-23 00:01:12 -05:00
Brad King 3c80666f00 Help: Document intended purpose of XCODE_ATTRIBUTE_<an-attribute> 
Also warn the reader against setting values CMake normally generates.

Issue: #21728
 2021-01-23 07:29:10 +11:00
Craig Scott ee9da76972 Unity: Generate reproducible unity IDs for anonymous namespaces 
Fixes: #21564
 2021-01-23 07:14:05 +11:00
Brad King 2a5955ac09 Intel: Replace deprecated Fortran flag -nofor_main with -nofor-main 
The `-nofor_main` flag was originally added by commit ccdd3e943d (Fix
Intel Fortran SHARED libraries on Linux, 2009-10-27, v2.8.2~915).  Since
then, Intel Fortran renamed the option to `-nofor-main` and deprecated
the old name.  The new name has been available for a long time, so
we can just switch to it.

Fixes: #21735
 2021-01-22 09:38:57 -05:00
Brad King 6bd251ace7 Merge topic 'SWIG-dependencies' 
89b01b04fa UseSWIG: use swig tool to generate dependencies

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5724
 2021-01-22 08:39:09 -05:00
Brad King 5a1b257fe7 Merge topic 'msvc-arm64ec-platform-support' 
4ea3a88625 MSVC: Add support for targeting ARM64EC

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5708
 2021-01-22 08:38:21 -05:00
Deniz Bahadir d586a4ad60 CPackDeb: dpkg-shlibdeps now supports searching for private shared libs 
The new CPack variable `CPACK_DEBIAN_PACKAGE_SHLIBDEPS_PRIVATE_DIRS`
can be set to a list of directories. If `CPACK_DEBIAN_PACKAGE_SHLIBDEPS`
or `CPACK_DEBIAN_<component>_PACKAGE_SHLIBDEPS` are set to `ON` these
directories will be searched by `dpkg-shlibdeps` in order to find
private shared library dependencies of the libraries/executables that
shall be packed.
 2021-01-22 08:33:01 -05:00
Kitware Robot 664038ab4f CMake Nightly Date Stamp 2021-01-22 00:01:14 -05:00
Marc Chevrier 89b01b04fa UseSWIG: use swig tool to generate dependencies 
add_custom_command() supports option DEPFILE when generator is
Makefiles or Ninja. And swig tool is able to generate a dependencies
file which is compatible with DEPFILE option.
 2021-01-21 19:29:04 +01:00
Brad King e93fb3c9c6 Merge branch 'release-3.18' 2021-01-21 13:05:01 -05:00
Brad King 82cfeeb484 Merge branch 'backport-3.18-ci-wix-download' into release-3.18 
Merge-request: !5725
 2021-01-21 13:04:24 -05:00
Brad King 9d4190be04 Merge branch 'release-3.19' 2021-01-21 13:01:20 -05:00
Brad King 34e5023682 Merge topic 'ci-wix-download' 
127864aa9c Merge branch 'backport-3.18-ci-wix-download' into ci-wix-download
8efbb0c95f ci: download WiX on Windows
5e5fecb7bc ci: speed up cmake and ninja downloads on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !5725
 2021-01-21 13:01:20 -05:00
Brad King 0df1fd9d43 Merge topic 'ci-wix-download' into release-3.19 
127864aa9c Merge branch 'backport-3.18-ci-wix-download' into ci-wix-download
8efbb0c95f ci: download WiX on Windows
5e5fecb7bc ci: speed up cmake and ninja downloads on Windows
6c34835a26 Merge branch 'backport-ninja-no-cleandead' into release-3.18
41ec2a4fac Merge branch 'FindPython-python2-soabi-suffix-fix' into release-3.18
035a0c497a Merge branch 'cuda_detect_vs_codegen' into release-3.18

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !5725
 2021-01-21 13:01:19 -05:00
Brad King 127864aa9c Merge branch 'backport-3.18-ci-wix-download' into ci-wix-download 2021-01-21 12:20:54 -05:00
Brad King 8efbb0c95f ci: download WiX on Windows 
Avoid requiring Windows CI hosts to have WiX installed.
 2021-01-21 11:53:11 -05:00
Brad King 5e5fecb7bc ci: speed up cmake and ninja downloads on Windows 
Invoke-WebRequest uses a progress bar by default, but we have no
interactive session anyway.  Turn it off to speed up downloads.
 2021-01-21 11:49:49 -05:00
Brad King c69567e56a Merge topic 'FindGit-cache-version' 
76fdeb6d13 Tests: FindGit already provides the git version, re-use it
315a200f0c FindGit: Cache the GIT_EXECUTABLE version for the current run

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5712
 2021-01-21 09:27:04 -05:00
Brad King 8cdb9de586 Merge topic 'cuda-archs' 
92854bf29e CUDA: Update arch selection, restructure for maintainability
a58a572459 CUDA: Add arch selection debug mode to print out CUDA versions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Raul Tambre <raul@tambre.ee>
Merge-request: !5719
 2021-01-21 09:19:23 -05:00
Brad King 9d6e6b7d3b Merge topic 'vs-sdk-selection' into release-3.19 
1e67482daf VS: Generalize Win10 max SDK version to all VS generators

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5721
 2021-01-21 09:18:31 -05:00
Brad King 82b5970246 Merge branch 'release-3.19' 2021-01-21 09:18:31 -05:00
Brad King fddbb7db4b Merge topic 'vs-sdk-selection' 
1e67482daf VS: Generalize Win10 max SDK version to all VS generators

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5721
 2021-01-21 09:18:31 -05:00