summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'vs-clangcl'Brad King2020-03-271-1/+3
|\ | | | | | | | | | | | | f3d7a15010 VS: Fix ClangCL toolset compiler path detection Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4523
| * VS: Fix ClangCL toolset compiler path detectionBrad King2020-03-261-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | Prior to commit 3c125c6de0 (VS: Support Visual Studio Clang Toolkit identification, 2019-12-03, v3.17.0-rc1~341^2) using `-T ClangCL` would work but `CMAKE_{C,CXX}_COMPILER` would be detected as `cl.exe` even though `clang-cl.exe` is the actual compiler. That commit attempted to fix the detection by using `$(ClangClExecutable)` as we do for LLVM-distributed toolsets, but that is not actually defined. Instead, look for `$(CLToolExe)` in the `PATH`. Fixes: #20504
* | Merge branch 'release-3.17'Brad King2020-03-270-0/+0
|\ \
| * \ Merge topic 'FindPython-variable-spelling-error' into release-3.17Brad King2020-03-271-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | 63580668a8 FindPython: fix variable spelling error Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4529
* | \ \ Merge topic 'FindPython-variable-spelling-error'Brad King2020-03-271-1/+1
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | 63580668a8 FindPython: fix variable spelling error Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4529
| * | | FindPython: fix variable spelling errorMarc Chevrier2020-03-261-1/+1
| | | |
* | | | Merge branch 'release-3.17'Brad King2020-03-270-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Merge topic 'CheckIPOSupported-cleanup-cache' into release-3.17Brad King2020-03-271-2/+4
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4b8297721f CheckIPOSupported: Avoid polluting cache with common name 'result' Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Kyle Edwards <kyle.edwards@kitware.com> Merge-request: !4528
* | \ \ \ Merge topic 'CheckIPOSupported-cleanup-cache'Brad King2020-03-271-2/+4
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 4b8297721f CheckIPOSupported: Avoid polluting cache with common name 'result' Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Kyle Edwards <kyle.edwards@kitware.com> Merge-request: !4528
| * | | | CheckIPOSupported: Avoid polluting cache with common name 'result'Brad King2020-03-261-2/+4
| | |_|/ | |/| | | | | | | | | | Fixes: #20508
* | | | Merge branch 'release-3.17'Brad King2020-03-270-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Merge topic 'nmc-cl-showincludes' into release-3.17Brad King2020-03-271-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6c7e6b1e49 Ninja Multi-Config: Fix MSVC showincludes prefix detection Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Kyle Edwards <kyle.edwards@kitware.com> Merge-request: !4526
* | \ \ \ Merge topic 'nmc-cl-showincludes'Brad King2020-03-271-1/+1
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 6c7e6b1e49 Ninja Multi-Config: Fix MSVC showincludes prefix detection Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Kyle Edwards <kyle.edwards@kitware.com> Merge-request: !4526
| * | | | Ninja Multi-Config: Fix MSVC showincludes prefix detectionBrad King2020-03-261-1/+1
| | |/ / | |/| | | | | | | | | | | | | | | | | | Activate the detection logic for this generator too. Fixes: #20506
* | | | Merge branch 'release-3.17'Brad King2020-03-270-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Merge topic 'llvm-rc-stderr' into release-3.17Brad King2020-03-274-3/+13
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dc93cbb0d8 llvm-rc: Print stderr output when calling tools through cmake_llvm_rc Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4525
* | \ \ \ Merge topic 'llvm-rc-stderr'Brad King2020-03-274-3/+13
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | dc93cbb0d8 llvm-rc: Print stderr output when calling tools through cmake_llvm_rc Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4525
| * | | | llvm-rc: Print stderr output when calling tools through cmake_llvm_rcThomas Bernard2020-03-264-3/+13
| | |/ / | |/| | | | | | | | | | | | | | | | | | The stored error pipe is output if the program fails. Fixes: #20494
* | | | Merge branch 'release-3.17'Brad King2020-03-270-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Merge topic 'llvm-rc-depfile' into release-3.17Brad King2020-03-271-3/+4
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2c724c3aea llvm-rc: Write depfile to location specified by the generator 4cc876540e llvm-rc: Select preprocessor from active languages Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4524
* | \ \ \ Merge topic 'llvm-rc-depfile'Brad King2020-03-271-3/+4
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 2c724c3aea llvm-rc: Write depfile to location specified by the generator 4cc876540e llvm-rc: Select preprocessor from active languages Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4524
| * | | | llvm-rc: Write depfile to location specified by the generatorThomas Bernard2020-03-261-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the depfile flags to `CMAKE_DEPFILE_FLAGS_RC` so that they are only usedwith generators that use depfiles. Also switch to using the `<DEPFILE>` placeholder for the location of the depfile so that it goes where the generator expects. Fixes: #20493
| * | | | llvm-rc: Select preprocessor from active languagesThomas Bernard2020-03-261-2/+2
| | |/ / | |/| | | | | | | | | | | | | | | | | | The llvm-rc preprocessor is selected according to the CMAKE_C_COMPILER_ID / CMAKE_CXX_COMPILER_ID which are only defined when the C or CXX language is active.
* | | | Merge branch 'release-3.16'Brad King2020-03-270-0/+0
|\ \ \ \
| * \ \ \ Merge branch 'make-nested-silent' into release-3.16Brad King2020-03-261-1/+5
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !4515
* | \ \ \ \ Merge branch 'release-3.17'Brad King2020-03-270-0/+0
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Merge topic 'make-nested-silent' into release-3.17Brad King2020-03-271-1/+5
| |\ \ \ \ \ | | | |/ / / | | |/| | / | | |_|_|/ | |/| | | | | | | | | | | | | d6d9da5178 Makefiles: Fix silencing of nested calls for GNU make 4.3 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4515
* | | | | Merge topic 'make-nested-silent'Brad King2020-03-271-1/+5
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | d6d9da5178 Makefiles: Fix silencing of nested calls for GNU make 4.3 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4515
| * | | | Makefiles: Fix silencing of nested calls for GNU make 4.3Brad King2020-03-261-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since GNU make 4.3, `.SILENT:` no longer causes nested `$(MAKE)` calls to get `-s` implicitly. Add the `-s` flag explicitly on such calls to suppress messages about Entering/Leaving directories. Fixes: #20487
* | | | | CMake Nightly Date StampKitware Robot2020-03-271-1/+1
| | | | |
* | | | | Merge topic 'cleanup-endls-3'Brad King2020-03-264-124/+121
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8e3a65d963 Refactor: Avoid `std::endl` where it's not necessary (part 3) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4517
| * | | | | Refactor: Avoid `std::endl` where it's not necessary (part 3)Alex Turbov2020-03-244-124/+121
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `std::endl` manipulator, except inserting `\n` character, also performs `os.flush()`, which may lead to undesired effects (like disk I/O in the middle of forming data strings). For the `std::stringstream` it also has no meaning. * replace multiple `operator<<` calls on a string literal w/ the only call and the only (bigger) string literal; * replace one character string literal used in `operator<<` w/ a char literal.
* | | | | | Merge topic 'cleanup-endls-2'Brad King2020-03-268-93/+85
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1e4b5c7d09 Refactor: Avoid `std::endl` where it's not necessary (part 2) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4514
| * | | | | | Refactor: Avoid `std::endl` where it's not necessary (part 2)Alex Turbov2020-03-248-93/+85
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `std::endl` manipulator, except inserting `\n` character, also performs `os.flush()`, which may lead to undesired effects (like disk I/O in the middle of forming data strings). For the `std::stringstream` it also has no meaning. * replace multiple `operator<<` calls on a string literal w/ the only call and the only (bigger) string literal; * replace one character string literal used in `operator<<` w/ a char literal.
* | | | | | Merge topic 'string-prefix'Brad King2020-03-2662-515/+493
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ec7928ef26 use _s to construct static string_views at several places 94de927cab VS10Generator: avoid many string allocations 8ca2504a4d use string_views to avoid memory allocations 761f1adcae check for a valid URL scheme before starting to do any splitting ef778d77e0 replace std::string::substr() with operations that do not allocate memory 77616f4681 pass cm::string_view to cmVisualStudioSlnParser::ParseTag() ada6a3226f use cm::string_view for language extension lookups 48adc29721 replace "std::string::find(x) == 0" with cmHasPrefix() ... Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4501
| * | | | | | use _s to construct static string_views at several placesRolf Eike Beer2020-03-244-106/+116
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This should avoid the runtime strlen() call.
| * | | | | | VS10Generator: avoid many string allocationsRolf Eike Beer2020-03-242-48/+36
| | | | | | |
| * | | | | | use string_views to avoid memory allocationsRolf Eike Beer2020-03-246-25/+37
| | | | | | |
| * | | | | | check for a valid URL scheme before starting to do any splittingRolf Eike Beer2020-03-231-6/+7
| | | | | | |
| * | | | | | replace std::string::substr() with operations that do not allocate memoryRolf Eike Beer2020-03-2311-23/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modify the original string instead of creating a new copy with substr() when it is not used for anything else afterwards.
| * | | | | | pass cm::string_view to cmVisualStudioSlnParser::ParseTag()Rolf Eike Beer2020-03-232-7/+8
| | | | | | |
| * | | | | | use cm::string_view for language extension lookupsRolf Eike Beer2020-03-234-12/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Once the list of extensions is build the set is just a copy of the vector and not modified anymore. Use a string_view for the members of the set, which saves a small amount of memory. It also makes possible to use string_views as lookup keys, so the callers do not need to create copies for the extensions anymore.
| * | | | | | replace "std::string::find(x) == 0" with cmHasPrefix()Rolf Eike Beer2020-03-2327-114/+129
| | | | | | |
| * | | | | | replace "substr(0, xx) ==" with cmHasPrefix()Rolf Eike Beer2020-03-239-24/+16
| | | | | | |
| * | | | | | allow cmCTest::CleanString() to skip input charactersRolf Eike Beer2020-03-232-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This entirely avoids that one needs to call std::string::substr() for the input.
| * | | | | | CTest: avoid repeated string comparesRolf Eike Beer2020-03-232-132/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only one key can match per iteration, avoid any further compares when one match was already found. While at it entirely avoid that the key and value strings are copied.
| * | | | | | Mumps coverage: directly pass std::string as argumentRolf Eike Beer2020-03-236-9/+9
| | | | | | |
| * | | | | | remove pointless return value from cmCTestTestHandler::CleanTestOutput()Rolf Eike Beer2020-03-232-4/+3
| | | | | | |
| * | | | | | PyCoverage: avoid repeated string splitting, especially for uncovered linesRolf Eike Beer2020-03-231-20/+17
| | | | | | |
| * | | | | | use std::string::rfind() instead of open coding itRolf Eike Beer2020-03-231-12/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | While at it avoid creating a new string.