Commit Graph

35076 Commits

Author SHA1 Message Date
Brad King e66eec143c Merge topic 'working-directory-fixes'
aba92ffd cmWorkingDirectory: use the new class
047a5e4d cmWorkingDirectory: add class for changing the workdir
89891bcb cmCTest, cmCTestCoverageHandler: remove cwd dance
c3304fa5 OSXScriptLauncher: remove unused variable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Brad King <brad.king@kitware.com>
Merge-request: !540
2017-03-07 08:24:37 -05:00
Brad King 632534104c Merge topic 'cpack_nsis_sign_uninstaller'
09475c29 CPack/NSIS: Sign the uninstaller

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !512
2017-03-07 08:24:09 -05:00
Brad King 696c75e991 Merge topic 'autogen_common'
ef3c319b Autogen: Test: Add mocDepends test
7f9baf57 Autogen: Test: Add generated qrc file to rccDepends test
81656b92 Autogen: Test: Add generated file to moc rerun test
d9a7ef80 Autogen: Test: Add timestamp comparison to moc rerun test
89780663 Autogen: Test: Rename automoc_rerun test to mocRerun
9cad44dc Autogen: Test: Rename autorcc_depends test to rccDepends
60274e1d Autogen: Add RunCommand method with built in logging
8f2ad9c4 Autogen: Error return when a scan file is not readable
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !543
2017-03-07 08:23:00 -05:00
Brad King 1e1cb41c46 Merge topic 'FindHDF5-lang-include-dirs'
c6bef559 FindHDF5: set HDF5_<lang>_INCLUDE_DIRS in all cases

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !548
2017-03-07 08:22:37 -05:00
Brad King fda91f4099 Merge topic 'doc-sort-cmake-variables'
eb44f001 Help: Sort cmake-variables.7 toctree

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !556
2017-03-07 08:22:03 -05:00
Ruslan Baratov eb44f00192 Help: Sort cmake-variables.7 toctree 2017-03-07 08:09:01 -05:00
Kitware Robot 51fbaa3099 CMake Nightly Date Stamp 2017-03-07 00:01:03 -05:00
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
Kris Thielemans c6bef559f3 FindHDF5: set HDF5_<lang>_INCLUDE_DIRS in all cases
In the case that we're using `find_path` to find the include directory,
only the `_DIR` variable was set, while in all other cases only the
`_DIRS` variable was set.  Set the `_DIRS` variable in all cases (while
keeping `_DIR` as result of `find_path`).  Also document the `_DIRS`
variable.

Fixes: #16694
2017-03-06 13:09:49 -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
Ben Boeckel aba92ffd92 cmWorkingDirectory: use the new class
These functions just need to change the directory for a block of code
and then go back to the caller's expected location. Use
cmWorkingDirectory to ensure that all return paths are handled.
2017-03-06 10:38:58 -05:00
Ben Boeckel 047a5e4d66 cmWorkingDirectory: add class for changing the workdir 2017-03-06 10:38:20 -05:00
Ben Boeckel 89891bcb9e cmCTest, cmCTestCoverageHandler: remove cwd dance
The working directory changes here didn't really accomplish anything.
2017-03-06 10:38:00 -05:00
Ben Boeckel c3304fa510 OSXScriptLauncher: remove unused variable 2017-03-06 10:37:41 -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