summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Detect the correct target architecture for clang compilers.Thomas Bernard2020-07-283-1/+12
| | | | | | During compiler identification, if CMAKE_{C,CXX}_COMPILER_TARGET is defined, the corresponding clang target flag is used to guaranty proper target architecture detection.
* 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
* | | | | | | Merge branch 'release-3.18'Brad King2020-07-270-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge topic 'FindXalanC-1.12' into release-3.18Brad King2020-07-271-3/+3
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4bf102418b FindXalanC: Fix version parsing for XalanC 1.12 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5056
* | \ \ \ \ \ \ Merge topic 'FindXalanC-1.12'Brad King2020-07-271-3/+3
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4bf102418b FindXalanC: Fix version parsing for XalanC 1.12 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5056
| * | | | | | | FindXalanC: Fix version parsing for XalanC 1.12Brad King2020-07-241-3/+3
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The version header now puts parentheses around the components. Fixes: #21010
* | | | | | | Merge branch 'release-3.18'Brad King2020-07-270-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge topic 'vs-lang-flags' into release-3.18Brad King2020-07-274-0/+29
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c4109a1bc8 VS: Restore toleration of target-wide -TP flag with MSVC Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5051
* | | | | | | Merge topic 'vs-lang-flags'Brad King2020-07-274-0/+29
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * \ \ \ \ \ \ Merge branch 'backport-vs-lang-flags' into vs-lang-flagsBrad King2020-07-234-0/+29
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | VS: Restore toleration of target-wide -TP flag with MSVCBrad King2020-07-234-0/+29
| | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 3b547e2e4b (VS: Simplify logic adding source file C/C++ language flag to MSVC, 2020-05-15, v3.18.0-rc1~139^2~1) we only add a per-source language selection flag when the source file extension does not match the compiler's default. This approach breaks when a project adds a target-wide `-TP` flag. Although such projects likely did not work with non-VS generators, we did support them before in Visual Studio generators. Add a special case to tolerate such flags again. Fixes: #21005
* | | | | | | Merge topic 'EXCLUDE_FROM_ALL-genex'Brad King2020-07-276-10/+12
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | Help: Add release note for EXCLUDE_FROM_ALL genex supportBrad King2020-07-231-0/+5
| | | | | | | |
| * | | | | | | Tests: Simplify RunCMake.ExcludeFromAll single-config caseBrad King2020-07-232-8/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also avoid using parts of an unrelated test (NinjaMultiConfig) that were not designed for use with all generators.
| * | | | | | | Tests: Fix RunCMake.ExcludeFromAll test program warningBrad King2020-07-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a return value to `main()`.
| * | | | | | | cmGlobalGenerator: Fix spelling of EXCLUDE_FROM_ALL in error messageBrad King2020-07-232-2/+2
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2020-07-271-1/+1
| | | | | | | |
* | | | | | | | Merge topic 'consume_separator'Marc Chevrier2020-07-261-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bfed613132 STL Support: Fix cm::filesystem warnings; check for '\' not multichar ' \'. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5062
| * | | | | | | | STL Support: Fix cm::filesystem warnings; check for '\' not multichar ' \'.Fred Baksik2020-07-241-1/+1
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Utilities/std/cm/bits/fs_path.cxx:334:24: warning: multi-character character constant [-Wmultichar] || *ptr == ' \\' ^~~~~
* | | | | | | | CMake Nightly Date StampKitware Robot2020-07-261-1/+1
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2020-07-251-1/+1
|/ / / / / / /
* | | | | | | CMake Nightly Date StampKitware Robot2020-07-241-1/+1
| | | | | | |
* | | | | | | Merge branch 'release-3.18'Brad King2020-07-230-0/+0
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Merge topic 'file-GET_RUNTIME_DEPENDENCIES-terms' into release-3.18Brad King2020-07-231-2/+2
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2b60088d14 Help: Update file(GET_RUNTIME_DEPENDENCIES) prose to match option names Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5053
* | \ \ \ \ \ \ Merge topic 'file-GET_RUNTIME_DEPENDENCIES-terms'Brad King2020-07-231-2/+2
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2b60088d14 Help: Update file(GET_RUNTIME_DEPENDENCIES) prose to match option names Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5053
| * | | | | | | Help: Update file(GET_RUNTIME_DEPENDENCIES) prose to match option namesBrad King2020-07-231-2/+2
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge topic 'tutorial-update'Brad King2020-07-231-0/+1
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 63af35019a Tutorial: Add missing `language` option to literalinclude Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5046
| * | | | | | Tutorial: Add missing `language` option to literalincludeBetsy McPhail2020-07-221-0/+1
| | | | | | |
* | | | | | | Merge topic 'bootstrap-libuv-macos'Brad King2020-07-231-0/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e771330dd4 bootstrap: Fix libuv target platform conditions on macOS Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5044
| * | | | | | | bootstrap: Fix libuv target platform conditions on macOSBrad King2020-07-221-0/+3
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit 714ce72882 (bootstrap: Make libuv available during bootstrap, 2017-09-13, v3.10.0-rc1~106^2) we modified libuv to use POSIX interfaces during bootstrap. However, some code still expects `TARGET_OS_IPHONE` to be defined on Apple platforms to either `0` or `1`. In order to offer this, include `<TargetConditionals.h>` on Apple platforms even when bootstrapping.