summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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.
| * | | | | | CPackWIXGenerator: use cmStrCat for more partsRolf Eike Beer2020-03-231-5/+5
| | | | | | |
| * | | | | | remove needless check for std::string::substr()Rolf Eike Beer2020-03-231-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Passing npos is legal and means "rest of the string".
| * | | | | | cmcldeps: replace inefficient std::string::substr usageRolf Eike Beer2020-03-231-26/+24
| | | | | | |
| * | | | | | replace private startsWith() implementation with cmHasPrefix()Rolf Eike Beer2020-03-231-8/+4
| | | | | | |
* | | | | | | Merge topic 'update-kwsys'Brad King2020-03-265-88/+116
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5f8d1668a2 Merge branch 'upstream-KWSys' into update-kwsys 9d3b9ec4ab KWSys 2020-03-25 (4380f1ae) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4509
| * \ \ \ \ \ \ Merge branch 'upstream-KWSys' into update-kwsysBrad King2020-03-255-88/+116
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By KWSys Upstream * upstream-KWSys: KWSys 2020-03-25 (4380f1ae)
| | * | | | | | | KWSys 2020-03-25 (4380f1ae)KWSys Upstream2020-03-255-88/+116
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://gitlab.kitware.com/utils/kwsys.git at commit 4380f1ae99f3206938251393e94055a3e4120b2c (master). Upstream Shortlog ----------------- Rolf Eike Beer (6): 25b61c12 Directory: make it move constructible and assignable 8b1a29e1 optimize SystemToolsParseRegistryKey() 420c3b04 call std::string::clear() instead of assigning "" bc9a4256 avoid inefficient usage of std::string::substr() e3c051e2 SystemTools: create directories with the right permissions on Un*x 0085096e avoid std::string::find() to check for prefix
* | | | | | | | | Merge topic 'compile-commands-collapse-whitespace'Brad King2020-03-2626-49/+61
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e565053bce Ninja: Remove unnecessary newlines in compile commands 5d4bab500e Avoid consecutive whitespace in rules d8622fbd0f Modules: Collapse consecutive whitespace in strings Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4512
| * | | | | | | | | Ninja: Remove unnecessary newlines in compile commandsDaan De Meyer2020-03-231-2/+2
| | | | | | | | | |
| * | | | | | | | | Avoid consecutive whitespace in rulesDaan De Meyer2020-03-232-2/+14
| | | | | | | | | |
| * | | | | | | | | Modules: Collapse consecutive whitespace in stringsDaan De Meyer2020-03-2323-45/+45
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge topic 'cleanup-CollapseFullPath-calls'Brad King2020-03-2614-104/+52
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 25f48761fa Simplify absolute path conversions using CollapseFullPath full signature 12b39aef75 Remove redundant calls to CollapseFullPath Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4518
| * | | | | | | | | Simplify absolute path conversions using CollapseFullPath full signatureBrad King2020-03-247-51/+19
| | | | | | | | | |
| * | | | | | | | | Remove redundant calls to CollapseFullPathBrad King2020-03-248-53/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove calls where it is known the input is already a collapsed full path.
* | | | | | | | | | Merge topic 'mingw-windres-cross-compile'Brad King2020-03-261-5/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | af4adf6aa9 MinGW: Fix default windres selection when cross-compiling 0251ddadab MinGW: Drop unnecessary windres selection code with Unix Makefiles Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4520
| * | | | | | | | | | MinGW: Fix default windres selection when cross-compilingBrad King2020-03-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When cross-compiling to MinGW, select the `windres` tool named with the toolchain's prefix. Fixes: #20500
| * | | | | | | | | | MinGW: Drop unnecessary windres selection code with Unix MakefilesBrad King2020-03-251-4/+0
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 957c2aac7f (RC: Simplify selection of resource compiler based on C/C++ toolchain, 2015-05-07, v3.3.0-rc1~93^2~5) we select windres as the RC compiler on MinGW via `CMAKE_RC_COMPILER_INIT`. Drop the special case from commit be9afbf453 (Find mingw's windres also when Unix Makefiles are used, 2012-08-27, v2.8.10~152^2).
* | | | | | | | | | CMake Nightly Date StampKitware Robot2020-03-261-1/+1
| | | | | | | | | |
* | | | | | | | | | Merge topic 'cmake-compilation-no-compiler-extensions'Brad King2020-03-257-0/+57
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f034b0f663 CMake compilation: do not use compiler extensions Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4477
| * | | | | | | | | | CMake compilation: do not use compiler extensionsMarc Chevrier2020-03-237-0/+57
| | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For now, compiler extensions are no longer activated on CMake sources. However these extensions are still used for various third parties. This MR is a partial answer to the issue #20454.