summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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.
* | | | | Merge topic 'cmprop-state'Brad King2020-03-2510-55/+66
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ef408dd232 cmState::GetTargetTypeName: return type is *cmProp Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4505
| * | | | | cmState::GetTargetTypeName: return type is *cmPropVitaly Stakhovsky2020-03-1910-55/+66
| | | | | |
* | | | | | Merge topic 'cmprop-cache'Brad King2020-03-253-32/+28
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0bf0e35e59 cmCacheManager::GetProperty: return cmProp Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4503
| * | | | | | cmCacheManager::GetProperty: return cmPropVitaly Stakhovsky2020-03-193-32/+28
| |/ / / / /
* | | | | | Merge topic 'FindRuby-rvm'Brad King2020-03-256-5/+288
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 905d5667e8 FindRuby: Add support for RVM installations e6699b9b59 FindRuby: Validate Ruby_EXECUTABLE before accepting it Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4386
| * | | | | | FindRuby: Add support for RVM installationsJulien Marrec2020-03-236-5/+248
| | | | | | |
| * | | | | | FindRuby: Validate Ruby_EXECUTABLE before accepting itJulien Marrec2020-03-232-1/+41
| | | | | | |
* | | | | | | Merge branch 'release-3.17'Brad King2020-03-250-0/+0
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge topic 'FindPython-polish' into release-3.17Brad King2020-03-254-27/+21
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bf1ecfef7f FindPython: misc. fixes Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4519
* | \ \ \ \ \ \ \ Merge topic 'FindPython-polish'Brad King2020-03-254-27/+21
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | / / | |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | bf1ecfef7f FindPython: misc. fixes Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4519
| * | | | | | | FindPython: misc. fixesMarc Chevrier2020-03-244-27/+21
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Help: Fix errors regardings HINTS. Code: Optimize Python signature cache variable to avoid unecessary searchs.
* | | | | | | CMake Nightly Date StampKitware Robot2020-03-251-1/+1
| |_|_|_|/ / |/| | | | |
* | | | | | CMake Nightly Date StampKitware Robot2020-03-241-1/+1
| | | | | |
* | | | | | Merge branch 'release-3.17'Brad King2020-03-230-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge topic 'doc-typo' into release-3.17Brad King2020-03-231-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 356c7cec2c Help: Fixed typo in CMAKE_INSTALL_RPATH_USE_LINK_PATH.rst Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4516
* | \ \ \ \ \ Merge topic 'doc-typo'Brad King2020-03-231-1/+1
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 356c7cec2c Help: Fixed typo in CMAKE_INSTALL_RPATH_USE_LINK_PATH.rst Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4516
| * | | | | | Help: Fixed typo in CMAKE_INSTALL_RPATH_USE_LINK_PATH.rstJaak Ristioja2020-03-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jaak Ristioja <jaak@ristioja.ee>
* | | | | | | Merge branch 'release-3.17'Brad King2020-03-230-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge topic 'cmake-gui-open-check' into release-3.17Brad King2020-03-231-1/+1
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ecc0086bfc cmake-gui: Fix use-after-free in Open-possible check Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4508
* | | | | | | Merge topic 'cmake-gui-open-check'Brad King2020-03-231-1/+1
|\ \ \ \ \ \ \ | | |/ / / / / | |/| / / / / | |_|/ / / / |/| | | | | | | | | | | | | | | | | ecc0086bfc cmake-gui: Fix use-after-free in Open-possible check Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4508
| * | | | | cmake-gui: Fix use-after-free in Open-possible checkFrancisco Facioni2020-03-201-1/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | Fix `QCMake::checkOpenPossible` to copy `toLocal8Bit().data()` before its lifetime expires.
* | | | | CMake Nightly Date StampKitware Robot2020-03-231-1/+1
| |_|/ / |/| | |
* | | | CMake Nightly Date StampKitware Robot2020-03-221-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2020-03-211-1/+1
| | | |
* | | | Merge branch 'release-3.17'Brad King2020-03-200-0/+0
|\ \ \ \ | |/ / /
| * | | CMake 3.17.0v3.17.0Brad King2020-03-201-1/+1
| | | |
* | | | Merge branch 'release-3.17'Brad King2020-03-200-0/+0
|\ \ \ \ | |/ / /
| * | | Merge topic 'FindMatlab-r2020' into release-3.17Brad King2020-03-201-0/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 75331a4578 FindMatlab: Add R2020a=9.8 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4507
* | \ \ \ Merge topic 'FindMatlab-r2020'Brad King2020-03-201-0/+1
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | 75331a4578 FindMatlab: Add R2020a=9.8 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4507
| * | | | FindMatlab: Add R2020a=9.8Michael Hirsch, Ph.D2020-03-191-0/+1
| | | | | | | | | | | | | | | | | | | | This allows Matlab R2020a to be recognized as a valid Matlab version.
* | | | | Merge branch 'release-3.16'Brad King2020-03-200-0/+0
|\ \ \ \ \
| * \ \ \ \ Merge branch 'GetPrerequisites-vcruntime-is-system' into release-3.16Brad King2020-03-191-3/+3
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !4506
* | \ \ \ \ \ Merge branch 'release-3.17'Brad King2020-03-200-0/+0
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Merge topic 'GetPrerequisites-vcruntime-is-system' into release-3.17Brad King2020-03-201-3/+3
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 417b765f5a GetPrerequisites: Classify vcruntime libraries as system Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4506