mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-24 15:18:26 -05:00
Code Issues Packages Projects Releases Wiki Activity
49,294 Commits 2 Branches 401 Tags
f04c68fab3479e65f00a7ddbacddda326fb1658e
Commit Graph

49294 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King f04c68fab3 Merge topic 'noduplicates' 
78357e98a4 Avoid duplicate calls to GetDefinition

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5073
 2020-07-29 08:07:04 -04:00
Brad King ef8e8fdf09 Merge branch 'release-3.18' 2020-07-29 08:05:47 -04:00
Brad King 292a86bb8e Merge topic 'FindCURL-list-index-if' 
0faedae335 FindCURL: Fix list index check after search

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5070
 2020-07-29 08:05:47 -04:00
Brad King 7b4ffd4d25 Merge topic 'FindCURL-list-index-if' into release-3.18 
0faedae335 FindCURL: Fix list index check after search

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5070
 2020-07-29 08:05:47 -04:00
Kitware Robot 49c600952e CMake Nightly Date Stamp 2020-07-29 00:02:15 -04:00
Craig Scott 22bfe014d0 Merge topic 'file-download-no-save' 
fed7d8f76d file(DOWNLOAD): Make file argument optional

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5060
 2020-07-28 10:23:35 -04:00
Vitaly Stakhovsky 78357e98a4 Avoid duplicate calls to GetDefinition 2020-07-28 09:12:16 -04:00
Mike Gelfand 0faedae335 FindCURL: Fix list index check after search 
Fix logic added by commit fc5afbe970 (FindCURL: support COMPONENTS to
check features, 2018-11-28, v3.14.0-rc1~287^2~2).

When searching for particular components and `curl-config` reports one of
the components being searched for first in the list, `find_package` fails.
This is due to the check that treats non-zero index in the list as success
and zero index as failure, while documentation on `list(FIND)` states that
failure to find an element results in return value of -1 (not 0). I'm
hitting this when building cURL with support for HTTP and HTTPS protocols
only, and then trying to `find_package(CURL COMPONENTS HTTP HTTPS)`.

I'm using `if(NOT x EQUAL -1)` check form as it appears to be the most used
throughout the modules.

While fixing this issue I've looked through all the uses of `list(FIND)` in
other modules but wasn't able to find improper use except here.
 2020-07-28 09:09:43 -04:00
Brad King 261a2585d9 Merge topic 'cleanup-target-types' 
ef796cc743 cmGeneratorTarget: Skip computing link implementation for custom targets
45158b2afe cmGeneratorTarget: Simplify logic in ComputeLinkInterfaceLibraries
d6b1f5704e cmGeneratorTarget: Add missing nullptr checks
7695b67500 cmComputeTargetDepends: Add missing nullptr check
95b5df8646 cmGeneratorTarget: Skip computing languages for custom targets
2f0790df50 Factor out generator checks for filtering on non-compiling targets
422d9a0ab2 Factor out generator checks for filtering out interface libraries
bce82df0aa cmGeneratorTarget: Remove unnecessary target type check in dependency tracing
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kyle Edwards <kyle.edwards@kitware.com>
Merge-request: !5038
 2020-07-28 08:26:23 -04:00
Brad King 79d341d4d4 Merge topic 'cmctest-stdstring' 
825b04c67a cmCTest: Members accept std::string parameters

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5064
 2020-07-28 08:25:47 -04:00
Brad King dde97681e9 Merge topic 'revert-add_test-special-chars' into release-3.18 
5fc5f4d26e add_test: Revert "Allow special characters in test name"

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5067
 2020-07-28 08:24:34 -04:00
Brad King 231d39da40 Merge branch 'release-3.18' 2020-07-28 08:24:34 -04:00
Brad King 40d3f5a227 Merge topic 'revert-add_test-special-chars' 
5fc5f4d26e add_test: Revert "Allow special characters in test name"

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5067
 2020-07-28 08:24:34 -04:00
Brad King 1091e64177 Merge topic 'update-kwsys' 
ead4adad75 Merge branch 'upstream-KWSys' into update-kwsys
36819d99c1 KWSys 2020-07-24 (c3054d90)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5055
 2020-07-28 08:23:45 -04:00
Brad King 8f18382c66 Merge branch 'release-3.18' 2020-07-28 08:22:36 -04:00
Brad King 825e19b81f Merge topic 'sysroot-prefix' into release-3.18 
e67d9c6e31 Compilers: Ignore -print-sysroot prefix when it is '/'

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5066
 2020-07-28 08:22:35 -04:00
Brad King e0d8da383f Merge topic 'sysroot-prefix' 
e67d9c6e31 Compilers: Ignore -print-sysroot prefix when it is '/'

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5066
 2020-07-28 08:22:35 -04:00
Brad King 738f89f1ec Merge topic 'ctest-prefer-normative-text' 
c83919d193 CTest: Prefer normative terms to express subprocess failures

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Lukas Riedel <mail@lukasriedel.com>
Acked-by: Yunus Sevinchan <yunussevinchan@gmail.com>
Merge-request: !5050
 2020-07-28 08:21:38 -04:00
Kitware Robot e4e899056e CMake Nightly Date Stamp 2020-07-28 00:01:10 -04:00
Brad King 5fc5f4d26e add_test: Revert "Allow special characters in test name" 
Revert commit f84af8e270 (add_test: Allow special characters in test
name, 2020-05-16, v3.18.0-rc1~142^2).  Unfortunately the fix breaks
projects that were working around the limitation with manual escaping.
The fix can be re-introduced with a policy in a future version.

Also add a 3.18.1 release note explaining the change.

Fixes: #21017, #20965
Issue: #19391
 2020-07-28 08:04:11 +10:00
Kyle Edwards fed7d8f76d file(DOWNLOAD): Make file argument optional 2020-07-27 11:26:50 -04:00
Vitaly Stakhovsky 825b04c67a cmCTest: Members accept std::string parameters 2020-07-27 10:58:39 -04:00
Brad King e67d9c6e31 Compilers: Ignore -print-sysroot prefix when it is '/' 
Since commit 8cc384f629 (Compilers: Add paths from -print-sysroot to
system prefix path, 2020-03-25, v3.18.0-rc1~337^2) we prepend the
compiler's sysroot to `CMAKE_SYSTEM_PREFIX_PATH`.  This does not
make sense when the prefix is just `/`, such as on Ubuntu 16.04's
system compiler.

Fixes: #21019
 2020-07-27 10:53:43 -04:00
Brad King 7788494257 Merge branch 'release-3.18' 2020-07-27 10:52:45 -04:00
Brad King 7c99b7d5da Merge topic 'fix-dependent-pipelines' into release-3.18 
726766713b gitlab-ci: avoid failing dependent steps

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5069
 2020-07-27 10:52:44 -04:00
Brad King d6f3b4d18b Merge topic 'fix-dependent-pipelines' 
726766713b gitlab-ci: avoid failing dependent steps

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5069
 2020-07-27 10:52:44 -04:00
Brad King cd8be45928 Merge topic 'ninja-remove-param-default' 
cfe2dc4721 Ninja: Remove parameter default for cmNinjaTargetDepends

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5059
 2020-07-27 10:51:12 -04:00
Brad King 85aa2ad653 Merge branch 'release-3.17' 2020-07-27 10:49:00 -04:00
Brad King 70583dd5de Merge branch 'release-3.18' 2020-07-27 10:47:58 -04:00
Brad King b76fa1b62a Merge topic 'bootstrap-intel' 
796466284b bootstrap: Fix support for Intel compiler with modern GNU system compiler

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5057
 2020-07-27 10:47:58 -04:00
Brad King 16f77ce412 Merge topic 'bootstrap-intel' into release-3.18 
796466284b bootstrap: Fix support for Intel compiler with modern GNU system compiler

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5057
 2020-07-27 10:47:57 -04:00
Brad King 95adaa5b71 Merge branch 'release-3.18' 2020-07-27 10:46:35 -04:00
Brad King 90c88302b5 Merge topic 'externalproject-download-git-2.20-fix' into release-3.18 
8dbefc3ca6 ExternalProject: omit --no-checkout from git clone when using git 2.20.x.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5054
 2020-07-27 10:46:35 -04:00
Brad King c186a43355 Merge topic 'externalproject-download-git-2.20-fix' 
8dbefc3ca6 ExternalProject: omit --no-checkout from git clone when using git 2.20.x.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5054
 2020-07-27 10:46:35 -04:00
Brad King c144eb5fd9 Merge branch 'release-3.18' 2020-07-27 10:45:15 -04:00
Brad King e0002c3e54 Merge topic 'xcode-12-legacy-deprecation' 
36fc3a1e84 Xcode: Suppress legacy build system deprecation warning

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5052
 2020-07-27 10:45:15 -04:00
Brad King 4b0c4ca3d8 Merge topic 'xcode-12-legacy-deprecation' into release-3.18 
36fc3a1e84 Xcode: Suppress legacy build system deprecation warning

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5052
 2020-07-27 10:45:14 -04:00
Brad King 7945cba00a Merge branch 'release-3.18' 2020-07-27 10:43:55 -04:00
Brad King c1b60f94c9 Merge topic 'FindXalanC-1.12' 
4bf102418b FindXalanC: Fix version parsing for XalanC 1.12

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5056
 2020-07-27 10:43:55 -04:00
Brad King fadedcbb72 Merge topic 'FindXalanC-1.12' into release-3.18 
4bf102418b FindXalanC: Fix version parsing for XalanC 1.12

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5056
 2020-07-27 10:43:54 -04:00
Brad King 2cafbee76d Merge branch 'release-3.18' 2020-07-27 10:42:44 -04:00
Brad King e19a62e28b Merge topic 'vs-lang-flags' into release-3.18 
c4109a1bc8 VS: Restore toleration of target-wide -TP flag with MSVC

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5051
 2020-07-27 10:42:44 -04:00
Brad King ea8bb8a2a7 Merge topic 'vs-lang-flags' 
a33a4ec68b Merge branch 'backport-vs-lang-flags' into vs-lang-flags
c4109a1bc8 VS: Restore toleration of target-wide -TP flag with MSVC

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5051
 2020-07-27 10:42:44 -04:00
Brad King 11cf196fd2 Merge topic 'EXCLUDE_FROM_ALL-genex' 
22bd267388 Help: Add release note for EXCLUDE_FROM_ALL genex support
807c8aa9f0 Tests: Simplify RunCMake.ExcludeFromAll single-config case
36743436cf Tests: Fix RunCMake.ExcludeFromAll test program warning
99c131c5a3 cmGlobalGenerator: Fix spelling of EXCLUDE_FROM_ALL in error message

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5049
 2020-07-27 10:40:56 -04:00
Robert Maynard c83919d193 CTest: Prefer normative terms to express subprocess failures 
Issue: #21004
 2020-07-27 10:32:21 -04:00
Brad King ef796cc743 cmGeneratorTarget: Skip computing link implementation for custom targets 
Targets created by `add_custom_target` cannot be used with
`target_link_libraries` and so have no link implementation.
 2020-07-27 10:26:07 -04:00
Ben Boeckel 726766713b gitlab-ci: avoid failing dependent steps 
This avoids making busted jobs if a prerequisite fails.
 2020-07-27 10:02:34 -04:00
Kitware Robot 097a302da0 CMake Nightly Date Stamp 2020-07-27 00:01:28 -04:00
Marc Chevrier 2d0fe11f3e Merge topic 'consume_separator' 
bfed613132 STL Support: Fix cm::filesystem warnings; check for '\' not multichar ' \'.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5062
 2020-07-26 02:34:44 -04:00
Kitware Robot cdac7d3428 CMake Nightly Date Stamp 2020-07-26 00:01:08 -04:00