Merge branch 'fix-find_dependency-empty-version' into release
Merge branch 'intel-14-version' into release
CMake Nightly Date Stamp
CMake Nightly Date Stamp
Add an Andriod platform file.
Merge topic 'Android-platform' into next

f6cf7871 Add an Andriod platform file.
- Prevent unnecessary rebuilds

Repeated "cmake . && ninja" calls were resulting in rebuilds every time.

Change the test so that it uses "file(WRITE" to generate a ".in" file and
then configure_file to "copy if different" that ".in" file to the final
generated source file.

Now, rebuilds will only occur if there are changes to the generated source
file on "cmake ." runs after the first one.
Merge topic 'fix-out-of-date-CTestTestMemcheck' into next

629037c3 - Prevent unnecessary rebuilds
6313be44 CMake Nightly Date Stamp
2eb158ca CMake Nightly Date Stamp
QtDialog: Avoid linking to Qt4 WinMain when using Qt 5.

Override the QT_QTMAIN_LIBRARY cache variable with a regular
variable in the Qt 5 configuration. This avoids linking with the
Qt 4 version of the WinMain library.
Merge topic 'fix-Qt5-windows-build' into next

61c60b23 QtDialog: Avoid linking to Qt4 WinMain when using Qt 5.
Merge branch 'fix-Qt5-windows-build' into release
cmTarget: Restore <CONFIG>_LOCATION to CMP0026 OLD behavior (#14808)

Restore support for the undocumented <CONFIG>_LOCATION target property
removed by commit v3.0.0-rc1~175^2 (cmTarget: Remove support for
<CONFIG>_LOCATION property, 2013-12-30) as part of the CMP0026 OLD
behavior.
Merge branch 'master' into CONFIG-LOCATION-CMP0026
cmTarget: Port <CONFIG>_LOCATION support to updated string APIs
Merge topic 'CONFIG-LOCATION-CMP0026' into next

ea17a03b cmTarget: Port <CONFIG>_LOCATION support to updated string APIs
6e466c6f Merge branch 'master' into CONFIG-LOCATION-CMP0026
c903b531 cmTarget: Restore <CONFIG>_LOCATION to CMP0026 OLD behavior (#14808)
Merge branch 'CONFIG-LOCATION-CMP0026' into release
Merge topic 'FindPkgConfig_Extend-PKG_CONFIG_PATH' into next

3df51470 FindPkgConfig: Extend PKG_CONFIG_PATH using CMake variables (#12926)
FindPkgConfig: Extend PKG_CONFIG_PATH using CMake variables (#12926)

Use CMAKE_PREFIX_PATH, CMAKE_FRAMEWORK_PATH, and CMAKE_APPBUNDLE_PATH
cache and environment variables to extend PKG_CONFIG_PATH before calling
pkg-config.

In each of the path in these variables it searches for lib/pkgconfig.
Then, depending on the system, it searches for
lib/${CMAKE_LIBRARY_ARCHITECTURE}/pkgconfig (debian) or for
lib64/pkgconfig (other 64 bit unixes). If any of these path is found,
it is appended to the PKG_CONFIG_PATH enviromnent variable.

Add two new arguments to the pkg_check_module and pkg_search_module
macro, NO_CMAKE_PATH and NO_CMAKE_ENVIRONMENT_PATH. The new signature
are therefore:

   pkg_check_modules(<PREFIX> [REQUIRED] [QUIET]
                     [NO_CMAKE_PATH] [NO_CMAKE_ENVIRONMENT_PATH]
                     <MODULE> [<MODULE>]*)
   pkg_search_module(<PREFIX> [REQUIRED] [QUIET]
                     [NO_CMAKE_PATH] [NO_CMAKE_ENVIRONMENT_PATH]
                     <MODULE> [<MODULE>]*)

By default, if CMAKE_MINIMUM_REQUIRED_VERSION is 3.1 or later (in
order to keep compatibility with the previous behavior), or if
PKG_CONFIG_USE_CMAKE_PREFIX_PATH is set, the CMAKE_PREFIX_PATH,
CMAKE_FRAMEWORK_PATH, and CMAKE_APPBUNDLE_PATH cache and environment
variables will be added to pkgconfig search path.

The NO_CMAKE_PATH and NO_CMAKE_ENVIRONMENT_PATH arguments disable this
behavior for the cache variables and the environment variables,
respectively, similarly to the find_package() command.
Merge topic 'intel-14-version'

eddabf9f CMake*CompilerId: Fix patch level for Intel >= 14.0 (#14806)
Merge topic 'fix-Qt5-windows-build'

61c60b23 QtDialog: Avoid linking to Qt4 WinMain when using Qt 5.