CMake merge requestshttps://gitlab.kitware.com/cmake/cmake/-/merge_requests2019-04-22T07:40:49-04:00https://gitlab.kitware.com/cmake/cmake/-/merge_requests/3254FindQt3: Restore lib and bin path suffixes2019-04-22T07:40:49-04:00Christian PfeifferFindQt3: Restore lib and bin path suffixesRestore path suffixes incorrectly removed by !1502.
Hints do not participate in the usual bin/lib subdirectory search that
`<PackangeName>_ROOT` or `CMAKE_PREFIX_PATH` exhibit.
Fixes: #19185Restore path suffixes incorrectly removed by !1502.
Hints do not participate in the usual bin/lib subdirectory search that
`<PackangeName>_ROOT` or `CMAKE_PREFIX_PATH` exhibit.
Fixes: #191853.14.3Brad KingBrad Kinghttps://gitlab.kitware.com/cmake/cmake/-/merge_requests/3246VS: Provide the default platform name to project code2019-04-22T07:40:48-04:00Brad KingVS: Provide the default platform name to project codeThe value of `CMAKE_VS_PLATFORM_NAME` is computed by Visual Studio
generators based on `CMAKE_GENERATOR_PLATFORM` or some default.
Prior to the VS 2019 generator, the default was always `Win32`.
However, for the `Visual Studio 16 2019` g...The value of `CMAKE_VS_PLATFORM_NAME` is computed by Visual Studio
generators based on `CMAKE_GENERATOR_PLATFORM` or some default.
Prior to the VS 2019 generator, the default was always `Win32`.
However, for the `Visual Studio 16 2019` generator, the default is
based on the host platform.
Store the default in a new `CMAKE_VS_PLATFORM_NAME_DEFAULT` variable for
use by project code. This is particularly useful in toolchain files
because they are allowed to set `CMAKE_GENERATOR_PLATFORM` and so
`CMAKE_VS_PLATFORM_NAME` is not yet known. Of course the toolchain file
author knows whether it will set `CMAKE_GENERATOR_PLATFORM`, and if not
then `CMAKE_VS_PLATFORM_NAME_DEFAULT` provides the platform name that
will be used.
Fixes: #191773.14.3Brad KingBrad Kinghttps://gitlab.kitware.com/cmake/cmake/-/merge_requests/3237FindBoost: fix python detection on Gentoo2019-04-16T13:36:56-04:00Rolf Eike BeerFindBoost: fix python detection on GentooFixes #18743
I would even suggest it for the next 3.14 release if there will be one. It will not regress as the other variant is also checked, it is added 2 lines below anyway.Fixes #18743
I would even suggest it for the next 3.14 release if there will be one. It will not regress as the other variant is also checked, it is added 2 lines below anyway.3.14.3Brad KingBrad Kinghttps://gitlab.kitware.com/cmake/cmake/-/merge_requests/3236FindOpenGL: look for GLVND libraries with a libglvnd suffix2019-04-17T10:57:47-04:00Ben BoeckelFindOpenGL: look for GLVND libraries with a libglvnd suffixOn CentOS 6.10, the libglvnd package from EPEL installs its libraries
under a libglvnd subdirectory.
---
Here's the list of files contained within the package:
```
# rpm -ql libglvnd-devel
/usr/lib64/libGLdispatch.so
/usr/lib6...On CentOS 6.10, the libglvnd package from EPEL installs its libraries
under a libglvnd subdirectory.
---
Here's the list of files contained within the package:
```
# rpm -ql libglvnd-devel
/usr/lib64/libGLdispatch.so
/usr/lib64/libOpenGL.so
/usr/lib64/libglvnd/libEGL.so
/usr/lib64/libglvnd/libGL.so
/usr/lib64/libglvnd/libGLESv1_CM.so
/usr/lib64/libglvnd/libGLESv2.so
/usr/lib64/libglvnd/libGLX.so
```
Cc: @tfogal @brad.king3.14.3Brad KingBrad Kinghttps://gitlab.kitware.com/cmake/cmake/-/merge_requests/3233IRSL: Update redist directory for VS 2019 update 12019-04-16T13:36:56-04:00Brad KingIRSL: Update redist directory for VS 2019 update 1VS 2019 Update 1 will fix its redist directories to be named `VC142`
instead of `VC141`. It will also use cl `19.21` instead of `19.20`
so we can use that to distinguish the versions.
Fixes: #19131VS 2019 Update 1 will fix its redist directories to be named `VC142`
instead of `VC141`. It will also use cl `19.21` instead of `19.20`
so we can use that to distinguish the versions.
Fixes: #191313.14.3Brad KingBrad Kinghttps://gitlab.kitware.com/cmake/cmake/-/merge_requests/3221FindBoost: Add support for MSVC toolset version 14.22019-04-17T15:08:35-04:00Brad KingFindBoost: Add support for MSVC toolset version 14.2Record the vc142 toolset variant. Simplify the logic since all 14.x
toolsets are mutually ABI-compatible.Record the vc142 toolset variant. Simplify the logic since all 14.x
toolsets are mutually ABI-compatible.3.14.3Brad KingBrad King