35063 Commits

Author SHA1 Message Date
Sebastian Holtermann
ef3c319b97 Autogen: Test: Add mocDepends test 2017-03-06 22:01:04 +01:00
Sebastian Holtermann
7f9baf5790 Autogen: Test: Add generated qrc file to rccDepends test 2017-03-06 22:01:04 +01:00
Sebastian Holtermann
81656b9210 Autogen: Test: Add generated file to moc rerun test 2017-03-06 22:01:03 +01:00
Sebastian Holtermann
d9a7ef80aa Autogen: Test: Add timestamp comparison to moc rerun test 2017-03-06 22:01:03 +01:00
Sebastian Holtermann
89780663b3 Autogen: Test: Rename automoc_rerun test to mocRerun 2017-03-06 22:01:03 +01:00
Sebastian Holtermann
9cad44dce2 Autogen: Test: Rename autorcc_depends test to rccDepends 2017-03-06 22:01:03 +01:00
Sebastian Holtermann
60274e1d94 Autogen: Add RunCommand method with built in logging 2017-03-06 22:01:03 +01:00
Sebastian Holtermann
8f2ad9c4a0 Autogen: Error return when a scan file is not readable 2017-03-06 22:01:03 +01:00
Sebastian Holtermann
ea3bc1e5b0 Autogen: Add AUTOMOC/UIC support for generated source files
Closes #16186
Closes #14379
2017-03-06 22:01:03 +01:00
Sebastian Holtermann
e3af6bec67 Autogen: Initializer cleanups 2017-03-06 22:01:02 +01:00
Sebastian Holtermann
699321bfd5 Autogen: Add support for generated .qrc files 2017-03-06 22:01:02 +01:00
Sebastian Holtermann
a28ae16e3c Autogen: Embrace qrc file lists in braces in AutogenInfo.cmake
This allows empty .qrc files in any list position.
2017-03-06 22:01:02 +01:00
Sebastian Holtermann
0d9a5baa0e Autogen: Remove unused variables 2017-03-06 22:01:02 +01:00
Sebastian Holtermann
47dbe9267e Autogen: Add cmQtAutogeneratorCommon class with shared types and functions 2017-03-06 22:01:02 +01:00
Brad King
9662b9efb7 Merge topic 'doc-map-config-prop-example'
957bdb9e Help: Add example to MAP_IMPORTED_CONFIG_<CONFIG> docs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !545
2017-03-06 13:50:34 -05:00
Brad King
8c5ed37e08 Merge topic 'FindVulkan-fix-win-32'
723955cd FindVulkan: Fix for SDK versions < 1.0.42 on 32-bit Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !549
2017-03-06 13:35:58 -05:00
Matthäus G. Chajdas
723955cd2b FindVulkan: Fix for SDK versions < 1.0.42 on 32-bit Windows
Before Vulkan 1.0.42, the SDK would add the Bin directory to `PATH`,
which was confusing the 32-bit search on Windows.  Avoid such confusion
by ignoring the `PATH` when looking for the 32-bit version.

Vulkan 1.0.42 fixed the whole problem by moving the libraries into Lib,
Lib32, so this is strictly a compatibility fix for old SDKs.
2017-03-06 13:32:41 -05:00
Ruslan Baratov
957bdb9e6e Help: Add example to MAP_IMPORTED_CONFIG_<CONFIG> docs 2017-03-06 13:14:34 -05:00
Brad King
add3b1ee4f Merge topic 'FindHDF5-fix-definitions'
ea2a8dd2 FindHDF5: Restore `-D` in HDF5_DEFINITIONS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !554
2017-03-06 12:56:51 -05:00
Kris Thielemans
ea2a8dd268 FindHDF5: Restore -D in HDF5_DEFINITIONS
Changes in commit v3.8.0-rc1~7^2~5 (FindHDF5: Fix command-line parsing
argument extraction order, 2017-02-02) accidentally dropped `-D` from
preprocessor definition flags extracted from the HDF5 compiler wrappers.

Fixes: #16693
2017-03-06 12:48:49 -05:00
Brad King
a55ed1a37c Merge topic 'binaries-from-gitlab-repo'
9a1ee04d Utilities/Release: Fetch from gitlab.kitware.com repository

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !547
2017-03-06 10:31:36 -05:00
Kitware Robot
9f40ba259a CMake Nightly Date Stamp 2017-03-06 00:01:02 -05:00
Kitware Robot
01d5963552 CMake Nightly Date Stamp 2017-03-05 00:01:03 -05:00
Kitware Robot
d96d971ac0 CMake Nightly Date Stamp 2017-03-04 00:01:05 -05:00
Brad King
9a1ee04dd5 Utilities/Release: Fetch from gitlab.kitware.com repository
Update our release scripts to fetch from the gitlab.kitware.com
repository instead of the cmake.org repository.  Revise our
mapping of special branch names to account for the refs that
now store them in the new repository.
2017-03-03 15:03:00 -05:00
Brad King
e7e939058d Merge topic 'developer-setup'
6cd3079c SetupForDevelopment: Drop cmake.org remote repo configuration

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !546
2017-03-03 13:46:55 -05:00
Brad King
6cd3079ce8 SetupForDevelopment: Drop cmake.org remote repo configuration
We no longer push directly to cmake.org repositories.  Changes now
go through https://gitlab.kitware.com/cmake/cmake for integration.
2017-03-03 13:31:49 -05:00
Brad King
75da91ab95 Merge topic 'doc-development-process'
1cc73e9a CONTRIBUTING: Add link to review process document
9a65b127 CONTRIBUTING: Add link to development documentation README
205ac0f0 CONTRIBUTING: Add note about running developer setup script
9360e6c6 Help/dev: Document the CMake Review Process
d33de80c Help/dev: Exclude this directory from user-facing documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !542
2017-03-03 13:30:26 -05:00
Brad King
1cc73e9a6c CONTRIBUTING: Add link to review process document 2017-03-03 11:47:37 -05:00
Brad King
9a65b1272c CONTRIBUTING: Add link to development documentation README 2017-03-03 11:47:37 -05:00
Brad King
205ac0f034 CONTRIBUTING: Add note about running developer setup script 2017-03-03 11:47:36 -05:00
Brad King
9360e6c6a0 Help/dev: Document the CMake Review Process 2017-03-03 11:47:36 -05:00
Brad King
4e8ffb952c Merge branch 'release' 2017-03-03 09:36:55 -05:00
Brad King
e1adec32b8 CMake 3.8.0-rc2 v3.8.0-rc2 2017-03-03 08:29:09 -05:00
Brad King
d9f54b565a Merge branch 'release' 2017-03-03 08:25:56 -05:00
Brad King
2b52c6cde5 Merge topic 'FindJNI-archlinux-jvm-paths'
d0ada3e2 FindJNI: Add jvm paths for Arch Linux
2017-03-03 08:25:16 -05:00
Brad King
9f37f94d63 Merge branch 'FindJNI-archlinux-jvm-paths' into release 2017-03-03 08:16:10 -05:00
Kitsu
d0ada3e218 FindJNI: Add jvm paths for Arch Linux 2017-03-03 08:14:34 -05:00
Brad King
2ccf879ab4 Merge branch 'release' 2017-03-03 07:58:41 -05:00
Brad King
71d9861a42 Merge branch 'release-3.7' 2017-03-03 07:58:37 -05:00
Brad King
4e537aa42c Merge topic 'ipo-variable'
6b6191d8 Add variable 'CMAKE_INTERPROCEDURAL_OPTIMIZATION'
2017-03-03 07:57:36 -05:00
Brad King
79b017f23c Merge topic 'FindVulkan-update'
8e58f360 FindVulkan: Update for LunarG SDK import library location on Windows
2017-03-03 07:57:33 -05:00
Brad King
24c0e229ef Merge topic 'implicit-dir-symlinks'
69528fe6 Tests: Add case for RPATH exclusion of symlinks to implicit directories
f3102ca8 Merge branch 'backport-implicit-dir-symlinks' into implicit-dir-symlinks
c3fb650c cmOrderDirectories: Consider symlinks when checking implicit directories
b1a37362 cmOrderDirectories: Factor out implicit directory check
2017-03-03 07:57:29 -05:00
Kitware Robot
1e0841c672 CMake Nightly Date Stamp 2017-03-03 00:01:03 -05:00
Brad King
06ef23c3e0 Merge branch 'release' 2017-03-02 10:04:13 -05:00
Brad King
3e06cdc19b Merge branch 'FindVulkan-update' into release 2017-03-02 10:03:57 -05:00
Brad Davis
8e58f360f5 FindVulkan: Update for LunarG SDK import library location on Windows
As of at least 1.0.42 of the LunarG SDK, the `vulkan-1.lib` import
library on Windows is stored in `${VULKAN_SDK}/Lib` or
`${VULKAN_SDK}/Lib32`.
2017-03-02 10:02:20 -05:00
Ruslan Baratov
6b6191d875 Add variable 'CMAKE_INTERPROCEDURAL_OPTIMIZATION' 2017-03-02 09:37:39 -05:00
Brad King
c1fb7213ed Merge topic 'autogen_uic_paths'
3bf28f5e Autogen: New short InfoGet functions
154d8339 Autogen: Parse enabled feature configuration only
ac77fa35 Autogen: Add missing return on error
662ad240 Autogen: Rename and merge moc related methods
5adf22bb Autogen: Add AUTOUIC_SEARCH_PATHS release notes
36fa535d Autogen: Add AUTOUIC_SEARCH_PATHS documentation
6d7c02db Autogen: Add AUTOUIC_SEARCH_PATHS test
1cdf7c1b Autogen: Add AUTOUIC_SEARCH_PATHS support
110c1bf4 Autogen: Add subDirPrefix function
db431ecf Autogen: Merge FindInIncludeDirectories into FindIncludeFile
2017-03-02 09:26:13 -05:00
Brad King
6c332bd84c Merge topic 'find_library-custom-lib-suffix'
503f25d4 find_library: Allow custom lib suffix be used as find path
2017-03-02 09:26:08 -05:00