mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-22 22:31:18 -05:00
Code Issues Packages Projects Releases Wiki Activity
52,851 Commits 2 Branches 401 Tags
990b370401a26e43ddc3371ec056c6a8e2adfaec
Commit Graph

52851 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Orgad Shaneh 990b370401 FindMsys: Add a module to find MSYS and some bundled packages 2021-04-28 10:41:17 -04:00
Craig Scott 9178861245 Merge topic 'doc-LINK_DEPENDS_NO_SHARED-xref' 
9f2c3928cd Help: Convert CMAKE_LINK_DEPENDS_NO_SHARED to cross-reference link

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6056
 2021-04-28 07:14:17 -04:00
Kitware Robot 857373c53c CMake Nightly Date Stamp 2021-04-28 00:01:11 -04:00
Craig Scott 9f2c3928cd Help: Convert CMAKE_LINK_DEPENDS_NO_SHARED to cross-reference link 2021-04-28 09:26:31 +10:00
Brad King 95afd87917 Merge topic 'FindIconv-no-libc' 
404025b00c FindIconv: Avoid explicitly finding C runtime library
8b30e7adfb FindIntl: Use explicit find_library signature NAMES keyword

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Sibi Siddharthan <sibisiddharthan.github@gmail.com>
Merge-request: !6046
 2021-04-27 13:54:51 -04:00
Brad King 970f175d88 Merge topic 'ctest_junit' 
25bf514447 ctest: Add support for writing test results in JUnit XML format

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Zack Galbreath <zack.galbreath@kitware.com>
Acked-by: Michael Hirsch <michael@scivision.dev>
Acked-by: MvdHurk <maikelvandenhurk@hotmail.com>
Acked-by: Alexander Richardson <arichardson.kde@gmail.com>
Merge-request: !6020
 2021-04-27 13:53:55 -04:00
Brad King 20b2bf0047 Merge topic 'update-kwsys' 
e57c4116ac Merge branch 'upstream-KWSys' into update-kwsys
1ba07ff0f8 KWSys 2021-04-26 (642ddfcc)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6047
 2021-04-27 13:52:17 -04:00
Brad King e578ed1275 Merge topic 'revert-vs-asan' 
7fce2d372e VS: Revert "Add support for ASAN -fsanitize=address flag"

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6048
 2021-04-27 13:51:05 -04:00
Brad King 893a5108c5 Merge topic 'msys-simple' 
231df230d5 Help: Add release note for MSYS runtime support
ddcd1469e8 MSYS: Add support for running under MSYS runtime environment
b3ca4f9ad1 cm/filesystem: Work around crash when compiled for CYGWIN/MSYS runtime
c9aec3d4a9 FindCurses: Do not assume ncurses is installed on CYGWIN

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5969
 2021-04-27 13:50:09 -04:00
Kitware Robot 0eb42defc2 CMake Nightly Date Stamp 2021-04-27 00:01:07 -04:00
Brad King 404025b00c FindIconv: Avoid explicitly finding C runtime library 
If `iconv` functionality is built into the C runtime library,
we do not need to link any libraries.  Do not find `libc`.

Fixes: #22114
 2021-04-26 14:30:29 -04:00
Brad King 231df230d5 Help: Add release note for MSYS runtime support 2021-04-26 14:27:34 -04:00
Orgad Shaneh ddcd1469e8 MSYS: Add support for running under MSYS runtime environment 
Detect MSYS as CYGWIN, with the required adaptations.
 2021-04-26 14:27:34 -04:00
Brad King b3ca4f9ad1 cm/filesystem: Work around crash when compiled for CYGWIN/MSYS runtime 
Issue: #22090
 2021-04-26 14:27:34 -04:00
Brad King c9aec3d4a9 FindCurses: Do not assume ncurses is installed on CYGWIN 2021-04-26 14:27:34 -04:00
Brad King 7fce2d372e VS: Revert "Add support for ASAN -fsanitize=address flag" 
Revert commit 1b37305b0f (VS: Add support for ASAN -fsanitize=address
flag, 2021-04-21).  The tag `EnableASAN` is created in
`ItemDefinitionGroup` but it needs to be in `PropertyGroup`.  Revert the
mapping pending an implementation in the generator.

Issue: #21081
 2021-04-26 14:15:41 -04:00
Brad King e57c4116ac Merge branch 'upstream-KWSys' into update-kwsys 
# By KWSys Upstream
* upstream-KWSys:
  KWSys 2021-04-26 (642ddfcc)
 2021-04-26 14:05:49 -04:00
KWSys Upstream 1ba07ff0f8 KWSys 2021-04-26 (642ddfcc) 
Code extracted from:

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

at commit 642ddfccfea808632f8d4b3be03971903e3d359d (master).

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

Rolf Eike Beer (1):
      7b0f5c20 SystemInformation: improve CPU counting on non-standard architectures
 2021-04-26 14:05:49 -04:00
Brad King 8b30e7adfb FindIntl: Use explicit find_library signature NAMES keyword 2021-04-26 13:00:35 -04:00
Brad King 9d4a0f12fb Merge topic 'SWIG' 
e3e005dbd8 UseSWIG: use swig dependencies for Xcode generator

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6042
 2021-04-26 11:35:22 -04:00
Brad King 395e1d458e Merge topic 'xcode_app_extensions' 
eb5e33ba47 Xcode: Add support for embedding app extensions
f62a2bf44f Tests: Factor out XcodeProject-Embed check function findAttribute()

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5934
 2021-04-26 11:34:38 -04:00
Brad King 3c1655936f Merge topic 'lzma-threads' 
c5c130e675 cmArchiveWrite: Consolidate multiple ways to set thread count
5380d858ff liblzma: Enable multi threaded stream encoding support
e9065e96dc Merge branch 'upstream-liblzma' into lzma-threads
ee909a8e8b liblzma 2020-03-17 (2327a461)
741b85b42b liblzma: Revise update script to get version 5.2.5

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !6014
 2021-04-26 11:33:49 -04:00
Brad King e69a328725 Merge topic 'autogen-moc-version' 
5b0ea5874a AutoGen: Retrieve Qt version from moc as fallback

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6027
 2021-04-26 11:31:54 -04:00
Brad King 6aabf2790c Merge topic 'file-REAL_PATH-EXPAND_TILDE' 
e4b793c614 file(REAL_PATH): add option EXPAND_TILDE

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Michael Hirsch <michael@scivision.dev>
Merge-request: !6033
 2021-04-26 11:30:57 -04:00
Brad King 2fcd6a0242 Merge branch 'release-3.20' 2021-04-26 11:27:17 -04:00
Brad King 8bc64a0c40 Merge topic 'doc-compile-features-wcdh' 
1f4ec3f4a7 Help: Do not recommend WCDH in cmake-compile-features(7)
1cc63f2cd5 Help: Fix typos in cmake-compile-features(7)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6037
 2021-04-26 11:27:17 -04:00
Brad King 21c40086ee Merge topic 'doc-compile-features-wcdh' into release-3.20 
1f4ec3f4a7 Help: Do not recommend WCDH in cmake-compile-features(7)
1cc63f2cd5 Help: Fix typos in cmake-compile-features(7)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6037
 2021-04-26 11:27:17 -04:00
Brad King 28cb4df402 Merge branch 'release-3.20' 2021-04-26 11:25:46 -04:00
Brad King 71087120b9 Merge topic 'ninja-multi-custom-target-post-build' into release-3.20 
f8e2a74712 Ninja Multi-Config: Correctly generate POST_BUILD custom targets

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6040
 2021-04-26 11:25:46 -04:00
Brad King fcafd30a5e Merge topic 'ninja-multi-custom-target-post-build' 
f8e2a74712 Ninja Multi-Config: Correctly generate POST_BUILD custom targets

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6040
 2021-04-26 11:25:46 -04:00
Zack Galbreath 25bf514447 ctest: Add support for writing test results in JUnit XML format 
Addresses #18654
 2021-04-26 08:55:22 -04:00
Kitware Robot eeb771e4d6 CMake Nightly Date Stamp 2021-04-26 00:01:07 -04:00
Kitware Robot 5f90a93fd7 CMake Nightly Date Stamp 2021-04-25 00:01:06 -04:00
Kitware Robot 88f5d4b24f CMake Nightly Date Stamp 2021-04-24 00:01:09 -04:00
Marc Chevrier e3e005dbd8 UseSWIG: use swig dependencies for Xcode generator 2021-04-23 17:09:12 +02:00
Brad King 1f4ec3f4a7 Help: Do not recommend WCDH in cmake-compile-features(7) 
Since commit da7ad7997e (WriteCompilerDetectionHeader: Add policy to
remove module, 2020-12-04, v3.20.0-rc1~350^2), the WCDH module is
deprecated.  Update the `cmake-compile-features(7)` manual section that
previously recommended WCDH to make such detection the project's
responsibility instead.  Move the old content of the section over to the
WCDH module to preserve it.
 2021-04-23 10:44:53 -04:00
Brad King 1cc63f2cd5 Help: Fix typos in cmake-compile-features(7) 2021-04-23 10:44:01 -04:00
Brad King 7de707cd7e Merge topic 'cuda-host-compiler-windows' 
625ef88a92 CUDA: Add CMAKE_CUDA_HOST_COMPILER support on Windows non-VS generators

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6030
 2021-04-23 10:30:15 -04:00
Brad King 2c81e1175c Merge topic 'test-RunCMake.CPack-errors' 
c54c284de7 Tests: Improve RunCMake.CPack* test error formatting

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6039
 2021-04-23 10:23:53 -04:00
Brad King 0a48080aeb Merge topic 'ExternalData-fail-reason' 
298760661f ExternalData: Improve error message when we fail to create a file

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !6038
 2021-04-23 10:22:51 -04:00
Joerg Bornemann 5b0ea5874a AutoGen: Retrieve Qt version from moc as fallback 
Consider the case where the find_package call for QtCore is wrapped in a
function call. Then AutoGen cannot determine the Qt version, because it
only looks at variables and directory properties. The former don't leave
the function scope and the latter are not set by default.

As a fallback, locate the moc executable via its target and call it with
the --version argument to determine the Qt version.

Issue: #22028
 2021-04-23 10:49:07 +02:00
Kitware Robot 15a148dec6 CMake Nightly Date Stamp 2021-04-23 00:01:09 -04:00
Kyle Edwards f8e2a74712 Ninja Multi-Config: Correctly generate POST_BUILD custom targets 
Fixes: #22096
 2021-04-22 15:51:53 -04:00
Nils Gladitz c5c130e675 cmArchiveWrite: Consolidate multiple ways to set thread count 
Merge use of SetFilterOption() into more abstract thread count
in cmArchiveWrite constructor.

libarchive defaulting of threads for threads == 0 seems to be
configuration dependent. Preemptively default thread count via
std::thread::hardware_concurrency().

Also allow negative values for the thread count in which case
the detected hardware concurrency is also used but the given
absolute thread count is used as an upper limit.
 2021-04-22 15:40:13 -04:00
Nils Gladitz 5380d858ff liblzma: Enable multi threaded stream encoding support 2021-04-22 15:40:06 -04:00
Brad King e9065e96dc Merge branch 'upstream-liblzma' into lzma-threads 
* upstream-liblzma:
  liblzma 2020-03-17 (2327a461)
 2021-04-22 15:39:58 -04:00
liblzma upstream ee909a8e8b liblzma 2020-03-17 (2327a461) 
Code extracted from:

    https://git.tukaani.org/xz.git

at commit 2327a461e1afce862c22269b80d3517801103c1b (v5.2.5).
 2021-04-22 15:39:31 -04:00
Brad King c54c284de7 Tests: Improve RunCMake.CPack* test error formatting 
Format message content for `message(FATAL_ERROR)`.
 2021-04-22 13:54:56 -04:00
Brad King 298760661f ExternalData: Improve error message when we fail to create a file 
Report the underlying system error.
 2021-04-22 13:06:11 -04:00
Nils Gladitz 741b85b42b liblzma: Revise update script to get version 5.2.5 
Keep files related to multi threaded stream encoding.
 2021-04-22 17:46:10 +02:00