Commit Graph

47353 Commits

Author SHA1 Message Date
Brad King 545875bebe Merge topic 'mingw-windres-cross-compile'
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
2020-03-26 09:06:13 -04:00
Kitware Robot 66e0b312c0 CMake Nightly Date Stamp 2020-03-26 00:01:10 -04:00
Brad King ea54f8d441 Merge topic 'cmake-compilation-no-compiler-extensions'
f034b0f663 CMake compilation: do not use compiler extensions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4477
2020-03-25 10:34:40 -04:00
Brad King 952fbd9ee5 Merge topic 'cmprop-state'
ef408dd232 cmState::GetTargetTypeName: return type is *cmProp

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4505
2020-03-25 09:25:26 -04:00
Brad King d13d5c11cf Merge topic 'cmprop-cache'
0bf0e35e59 cmCacheManager::GetProperty: return cmProp

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4503
2020-03-25 08:39:26 -04:00
Brad King 79415fa6d3 Merge topic 'FindRuby-rvm'
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
2020-03-25 08:16:38 -04:00
Brad King 3202980a1e Merge branch 'release-3.17' 2020-03-25 08:13:07 -04:00
Brad King f2b4576373 Merge topic 'FindPython-polish'
bf1ecfef7f FindPython: misc. fixes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4519
2020-03-25 08:13:07 -04:00
Brad King d14626afe5 Merge topic 'FindPython-polish' into release-3.17
bf1ecfef7f FindPython: misc. fixes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4519
2020-03-25 08:13:06 -04:00
Brad King af4adf6aa9 MinGW: Fix default windres selection when cross-compiling
When cross-compiling to MinGW, select the `windres` tool named with the
toolchain's prefix.

Fixes: #20500
2020-03-25 07:21:01 -04:00
Brad King 0251ddadab MinGW: Drop unnecessary windres selection code with Unix Makefiles
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).
2020-03-25 07:21:01 -04:00
Kitware Robot 69e495d10a CMake Nightly Date Stamp 2020-03-25 00:01:07 -04:00
Marc Chevrier bf1ecfef7f FindPython: misc. fixes
Help: Fix errors regardings HINTS.
Code: Optimize Python signature cache variable to avoid unecessary searchs.
2020-03-24 18:26:16 +01:00
Kitware Robot c98ec3692e CMake Nightly Date Stamp 2020-03-24 00:01:07 -04:00
Brad King 206a65c3b8 Merge branch 'release-3.17' 2020-03-23 10:54:42 -04:00
Brad King 1d9884fe7d Merge topic 'doc-typo'
356c7cec2c Help: Fixed typo in CMAKE_INSTALL_RPATH_USE_LINK_PATH.rst

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4516
2020-03-23 10:54:42 -04:00
Brad King c1ad4a74d4 Merge topic 'doc-typo' into release-3.17
356c7cec2c Help: Fixed typo in CMAKE_INSTALL_RPATH_USE_LINK_PATH.rst

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4516
2020-03-23 10:54:41 -04:00
Jaak Ristioja 356c7cec2c Help: Fixed typo in CMAKE_INSTALL_RPATH_USE_LINK_PATH.rst
Signed-off-by: Jaak Ristioja <jaak@ristioja.ee>
2020-03-23 09:46:08 -04:00
Brad King aef934ff63 Merge branch 'release-3.17' 2020-03-23 09:27:44 -04:00
Brad King a4abf61520 Merge topic 'cmake-gui-open-check'
ecc0086bfc cmake-gui: Fix use-after-free in Open-possible check

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4508
2020-03-23 09:27:44 -04:00
Brad King 170087f065 Merge topic 'cmake-gui-open-check' into release-3.17
ecc0086bfc cmake-gui: Fix use-after-free in Open-possible check

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4508
2020-03-23 09:27:43 -04:00
Julien Marrec 905d5667e8 FindRuby: Add support for RVM installations 2020-03-23 13:22:23 +01:00
Julien Marrec e6699b9b59 FindRuby: Validate Ruby_EXECUTABLE before accepting it 2020-03-23 13:21:40 +01:00
Marc Chevrier f034b0f663 CMake compilation: do not use compiler extensions
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.
2020-03-23 10:29:58 +01:00
Kitware Robot 8638c49f2a CMake Nightly Date Stamp 2020-03-23 00:01:05 -04:00
Kitware Robot 7099db5dd4 CMake Nightly Date Stamp 2020-03-22 00:01:11 -04:00
Kitware Robot 8bef78bb73 CMake Nightly Date Stamp 2020-03-21 00:01:12 -04:00
Francisco Facioni ecc0086bfc cmake-gui: Fix use-after-free in Open-possible check
Fix `QCMake::checkOpenPossible` to copy `toLocal8Bit().data()` before
its lifetime expires.
2020-03-20 08:38:31 -04:00
Brad King 9c3dddb4f5 Merge branch 'release-3.17' 2020-03-20 07:35:44 -04:00
Brad King e3185e3d1b CMake 3.17.0 v3.17.0 2020-03-20 06:26:14 -04:00
Brad King 6bea0b2290 Merge branch 'release-3.17' 2020-03-20 06:22:48 -04:00
Brad King dfca1887b0 Merge topic 'FindMatlab-r2020' into release-3.17
75331a4578 FindMatlab: Add R2020a=9.8

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4507
2020-03-20 06:22:48 -04:00
Brad King a2bbc34ace Merge topic 'FindMatlab-r2020'
75331a4578 FindMatlab: Add R2020a=9.8

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4507
2020-03-20 06:22:48 -04:00
Brad King bb22f4588f Merge branch 'release-3.16' 2020-03-20 06:21:11 -04:00
Brad King 3ab89b5475 Merge topic 'GetPrerequisites-vcruntime-is-system' into release-3.17
417b765f5a GetPrerequisites: Classify vcruntime libraries as system

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4506
2020-03-20 06:17:49 -04:00
Brad King 1294cb3485 Merge branch 'release-3.17' 2020-03-20 06:17:49 -04:00
Brad King 7c0346e90a Merge topic 'GetPrerequisites-vcruntime-is-system'
417b765f5a GetPrerequisites: Classify vcruntime libraries as system

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4506
2020-03-20 06:17:49 -04:00
Brad King 6786d7c92e Merge branch 'release-3.17' 2020-03-20 06:17:01 -04:00
Brad King 119d1dadce Merge topic 'export-repeat' into release-3.17
8affe9aa33 export: Fix use-after-free on multiple calls overwriting same FILE

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4494
2020-03-20 06:17:00 -04:00
Brad King 94139ac58e Merge topic 'export-repeat'
8affe9aa33 export: Fix use-after-free on multiple calls overwriting same FILE

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4494
2020-03-20 06:17:00 -04:00
Kitware Robot 9bbea2344b CMake Nightly Date Stamp 2020-03-20 00:01:11 -04:00
Michael Hirsch, Ph.D 75331a4578 FindMatlab: Add R2020a=9.8
This allows Matlab R2020a to be recognized as a valid Matlab version.
2020-03-19 12:47:10 -04:00
Brad King 2a085de535 Merge branch 'GetPrerequisites-vcruntime-is-system' into release-3.16
Merge-request: !4506
2020-03-19 10:19:43 -04:00
Err0rC0deX 417b765f5a GetPrerequisites: Classify vcruntime libraries as system
Previously GetPrerequisites classified `vcruntime*.dll` as type "other".
They should be classified as type "system".
2020-03-19 10:17:40 -04:00
Vitaly Stakhovsky ef408dd232 cmState::GetTargetTypeName: return type is *cmProp 2020-03-19 08:55:03 -04:00
Vitaly Stakhovsky 0bf0e35e59 cmCacheManager::GetProperty: return cmProp 2020-03-19 08:18:42 -04:00
Brad King 60db3af147 Merge topic 'cmprop-state'
bd89133543 cmState::GetCacheEntryValue: return cmProp

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4493
2020-03-19 07:18:27 -04:00
Brad King 7bdf84d2d5 Merge topic 'target-improve'
b915fec56e cmTarget: minor code improvements

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4483
2020-03-19 07:17:39 -04:00
Brad King e37f67c7f7 Merge topic 'CheckLanguage-private-vars'
36baf1f13c CheckLanguage: hide commonly used variable names

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4497
2020-03-19 07:17:00 -04:00
Brad King 2154d0239f Merge branch 'release-3.17' 2020-03-19 06:57:52 -04:00