summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Tests: Fix -Wsuggest-destructor-override warning in testCMExtMemoryBrad King2020-07-281-1/+1
|
* Merge topic 'cleanup-target-types'Brad King2020-07-2821-143/+186
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * cmGeneratorTarget: Skip computing link implementation for custom targetsBrad King2020-07-271-4/+16
| | | | | | | | | | Targets created by `add_custom_target` cannot be used with `target_link_libraries` and so have no link implementation.
| * cmGeneratorTarget: Simplify logic in ComputeLinkInterfaceLibrariesBrad King2020-07-231-5/+10
| | | | | | | | | | Also check the result of `GetLinkImplementationLibrariesInternal` before using it.
| * cmGeneratorTarget: Add missing nullptr checksBrad King2020-07-231-15/+17
| | | | | | | | Check the result of `GetLinkImplementationLibraries` before using it.
| * cmComputeTargetDepends: Add missing nullptr checkBrad King2020-07-231-7/+9
| | | | | | | | Check the result of `GetLinkImplementation` before using it.
| * cmGeneratorTarget: Skip computing languages for custom targetsBrad King2020-07-231-0/+5
| | | | | | | | | | Targets created by `add_custom_target` do not compile any sources and therefore have no languages.
| * Factor out generator checks for filtering on non-compiling targetsBrad King2020-07-237-22/+37
| | | | | | | | | | Add a `cmGeneratorTarget::CanCompileSources` helper method to tell generators whether a target might compile anything.
| * Factor out generator checks for filtering out interface librariesBrad King2020-07-2319-48/+58
| | | | | | | | | | | | Add a `cmGeneratorTarget::IsInBuildSystem` helper method to tell generators whether a target should participate in the generated build system.
| * cmGeneratorTarget: Remove unnecessary target type check in dependency tracingBrad King2020-07-231-23/+20
| | | | | | | | | | | | | | | | | | | | Since commit 2600e923a6 (Disallow INTERFACE libraries with add_custom_command(TARGET)., 2014-03-19, v3.0.0-rc3~1^2), we do not trace dependencies of INTERFACE libraries that do not participate in the build system. Therefore we can remove a check of the target type from the implementation that had been added by commit 9db9c1fc8b (cmTarget: Don't try to get sources of an INTERFACE_LIBRARY., 2014-02-14, v3.0.0-rc1~20^2).
| * cmTarget: Skip output dir property init for CMake-provided targetsBrad King2020-07-231-1/+2
| |
| * cmTarget: De-duplicate conditions for property initializationBrad King2020-07-231-17/+9
| |
| * cmGlobalNinjaGenerator: Replace switch default with all casesBrad King2020-07-231-2/+3
| |
| * cmLocalUnixMakefileGenerator3: Skip object file listing for custom targetsBrad King2020-07-231-1/+2
| |
* | Merge topic 'cmctest-stdstring'Brad King2020-07-2818-131/+120
|\ \ | | | | | | | | | | | | | | | | | | 825b04c67a cmCTest: Members accept std::string parameters Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5064
| * | cmCTest: Members accept std::string parametersVitaly Stakhovsky2020-07-2718-131/+120
| | |
* | | Merge branch 'release-3.18'Brad King2020-07-280-0/+0
|\ \ \
| * \ \ Merge topic 'revert-add_test-special-chars' into release-3.18Brad King2020-07-2859-383/+22
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5fc5f4d26e add_test: Revert "Allow special characters in test name" Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5067
* | \ \ \ Merge topic 'revert-add_test-special-chars'Brad King2020-07-2859-383/+22
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | 5fc5f4d26e add_test: Revert "Allow special characters in test name" Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5067
| * | | | add_test: Revert "Allow special characters in test name"Brad King2020-07-2759-383/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | Merge topic 'update-kwsys'Brad King2020-07-285-11/+34
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ead4adad75 Merge branch 'upstream-KWSys' into update-kwsys 36819d99c1 KWSys 2020-07-24 (c3054d90) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5055
| * \ \ \ \ Merge branch 'upstream-KWSys' into update-kwsysBrad King2020-07-245-11/+34
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By KWSys Upstream * upstream-KWSys: KWSys 2020-07-24 (c3054d90)
| | * | | | | KWSys 2020-07-24 (c3054d90)KWSys Upstream2020-07-245-11/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://gitlab.kitware.com/utils/kwsys.git at commit c3054d90612cc4a396d6e2087b696fc0923de1e9 (master). Upstream Shortlog ----------------- Jack Guo (1): 22216d56 SystemTools: Fix Touch() on broken symlink when create==false Robert Maynard (1): 29096513 Process: Prefer normative terms to express subprocess failures Sean McBride (1): eb6820b6 Glob: Explicitly delete copy construction and assignment
* | | | | | | Merge branch 'release-3.18'Brad King2020-07-280-0/+0
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Merge topic 'sysroot-prefix' into release-3.18Brad King2020-07-281-1/+3
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e67d9c6e31 Compilers: Ignore -print-sysroot prefix when it is '/' Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5066
* | \ \ \ \ \ \ Merge topic 'sysroot-prefix'Brad King2020-07-281-1/+3
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e67d9c6e31 Compilers: Ignore -print-sysroot prefix when it is '/' Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5066
| * | | | | | | Compilers: Ignore -print-sysroot prefix when it is '/'Brad King2020-07-271-1/+3
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | Merge topic 'ctest-prefer-normative-text'Brad King2020-07-282-4/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | CTest: Prefer normative terms to express subprocess failuresRobert Maynard2020-07-272-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue: #21004
* | | | | | | | CMake Nightly Date StampKitware Robot2020-07-281-1/+1
| |_|_|_|_|/ / |/| | | | | |
* | | | | | | Merge branch 'release-3.18'Brad King2020-07-270-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge topic 'fix-dependent-pipelines' into release-3.18Brad King2020-07-271-2/+2
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 726766713b gitlab-ci: avoid failing dependent steps Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5069
* | \ \ \ \ \ \ Merge topic 'fix-dependent-pipelines'Brad King2020-07-271-2/+2
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 726766713b gitlab-ci: avoid failing dependent steps Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5069
| * | | | | | | gitlab-ci: avoid failing dependent stepsBen Boeckel2020-07-271-2/+2
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | This avoids making busted jobs if a prerequisite fails.
* | | | | | | Merge topic 'ninja-remove-param-default'Brad King2020-07-276-31/+39
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cfe2dc4721 Ninja: Remove parameter default for cmNinjaTargetDepends Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5059
| * | | | | | | Ninja: Remove parameter default for cmNinjaTargetDependsKyle Edwards2020-07-246-31/+39
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'release-3.17'Brad King2020-07-270-0/+0
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'bootstrap-intel' into release-3.17Brad King2020-07-241-1/+1
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !5057
* | \ \ \ \ \ \ \ Merge branch 'release-3.18'Brad King2020-07-270-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
| * | | | | | | | Merge topic 'bootstrap-intel' into release-3.18Brad King2020-07-271-1/+1
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 796466284b bootstrap: Fix support for Intel compiler with modern GNU system compiler Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5057
* | | | | | | | | Merge topic 'bootstrap-intel'Brad King2020-07-271-1/+1
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 796466284b bootstrap: Fix support for Intel compiler with modern GNU system compiler Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5057
| * | | | | | | | bootstrap: Fix support for Intel compiler with modern GNU system compilerBrad King2020-07-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On systems with older GNU system compilers, the Intel C++ compiler does not define `__cplusplus` to any version newer than C++11. This prevented `bootstrap` from detecting that a given C++ standard flag has enabled C++17 mode in the compiler. In commit 033a4b12a5 (bootstrap: Extend C++17 check for our cast functions, 2019-12-14, v3.17.0-rc1~291^2) we added a preprocessor condition to attempt to detect C++17 mode in the Intel compiler on such systems by looking for `__cpp_if_constexpr`. However, on systems with a modern GNU system compiler, that definition is available even in C++11 mode. Switch to using `__cpp_deduction_guides` to detect C++17 mode for the Intel C++ compiler. That seems to be defined exclusively in C++17 mode regardless of the version of the system compiler. Fixes: #21013
* | | | | | | | | Merge branch 'release-3.18'Brad King2020-07-270-0/+0
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge topic 'externalproject-download-git-2.20-fix' into release-3.18Brad King2020-07-271-1/+5
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8dbefc3ca6 ExternalProject: omit --no-checkout from git clone when using git 2.20.x. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5054
* | \ \ \ \ \ \ \ \ Merge topic 'externalproject-download-git-2.20-fix'Brad King2020-07-271-1/+5
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8dbefc3ca6 ExternalProject: omit --no-checkout from git clone when using git 2.20.x. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5054
| * | | | | | | | | ExternalProject: omit --no-checkout from git clone when using git 2.20.x.Nate Avers2020-07-241-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The optimization from commit 627fc5b44f (ExternalProject: Avoid unnecessary checkout on clone, 2019-07-29, v3.16.0-rc1~325^2) triggers a bug in the Git 2.20.x series that is not in older or newer versions. Drop the optimization for that specific range of Git versions. Fixes: #21009
* | | | | | | | | | Merge branch 'release-3.18'Brad King2020-07-270-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge topic 'xcode-12-legacy-deprecation' into release-3.18Brad King2020-07-271-0/+2
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 36fc3a1e84 Xcode: Suppress legacy build system deprecation warning Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5052
* | \ \ \ \ \ \ \ \ \ Merge topic 'xcode-12-legacy-deprecation'Brad King2020-07-271-0/+2
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 36fc3a1e84 Xcode: Suppress legacy build system deprecation warning Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5052
| * | | | | | | | | | Xcode: Suppress legacy build system deprecation warningBrad King2020-07-231-0/+2
| | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Xcode 12 beta 3 now warns about using the legacy build system. Since generation of the build system is CMake's responsibility, the warning is not relevant to our users. Suppress it. Issue: #18088