summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Tests: Fix CPackComponents NSIS install rootBrad King2017-03-091-1/+1
| | | | | | Without `CPACK_VERBATIM_VARIABLES` a path with backslashes does not make it through `CPackConfig.cmake` properly. Just use forward slashes which NSIS seems to understand anyway.
* Merge topic 'cpack_nsis_sign_uninstaller'Brad King2017-03-073-1/+53
|\ | | | | | | | | | | | | 09475c29 CPack/NSIS: Sign the uninstaller Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !512
| * CPack/NSIS: Sign the uninstallerRoman Wüger2017-03-013-1/+53
| |
* | Merge topic 'autogen_common'Brad King2017-03-0732-548/+920
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Autogen: Test: Add mocDepends testSebastian Holtermann2017-03-069-0/+119
| | |
| * | Autogen: Test: Add generated qrc file to rccDepends testSebastian Holtermann2017-03-066-9/+39
| | |
| * | Autogen: Test: Add generated file to moc rerun testSebastian Holtermann2017-03-065-18/+37
| | |
| * | Autogen: Test: Add timestamp comparison to moc rerun testSebastian Holtermann2017-03-063-15/+32
| | |
| * | Autogen: Test: Rename automoc_rerun test to mocRerunSebastian Holtermann2017-03-067-9/+9
| | |
| * | Autogen: Test: Rename autorcc_depends test to rccDependsSebastian Holtermann2017-03-065-8/+8
| | |
| * | Autogen: Add RunCommand method with built in loggingSebastian Holtermann2017-03-062-58/+61
| | |
| * | Autogen: Error return when a scan file is not readableSebastian Holtermann2017-03-062-40/+67
| | |
| * | Autogen: Add AUTOMOC/UIC support for generated source filesSebastian Holtermann2017-03-061-92/+122
| | | | | | | | | | | | | | | Closes #16186 Closes #14379
| * | Autogen: Initializer cleanupsSebastian Holtermann2017-03-061-73/+70
| | |
| * | Autogen: Add support for generated .qrc filesSebastian Holtermann2017-03-064-77/+142
| | |
| * | Autogen: Embrace qrc file lists in braces in AutogenInfo.cmakeSebastian Holtermann2017-03-063-26/+31
| | | | | | | | | | | | This allows empty .qrc files in any list position.
| * | Autogen: Remove unused variablesSebastian Holtermann2017-03-061-3/+0
| | |
| * | Autogen: Add cmQtAutogeneratorCommon class with shared types and functionsSebastian Holtermann2017-03-065-166/+229
| | |
* | | Merge topic 'FindHDF5-lang-include-dirs'Brad King2017-03-071-0/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | c6bef559 FindHDF5: set HDF5_<lang>_INCLUDE_DIRS in all cases Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !548
| * | | FindHDF5: set HDF5_<lang>_INCLUDE_DIRS in all casesKris Thielemans2017-03-061-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Merge topic 'doc-sort-cmake-variables'Brad King2017-03-071-26/+26
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | eb44f001 Help: Sort cmake-variables.7 toctree Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !556
| * | | | Help: Sort cmake-variables.7 toctreeRuslan Baratov2017-03-071-26/+26
| | |/ / | |/| |
* | | | CMake Nightly Date StampKitware Robot2017-03-071-1/+1
|/ / /
* | | Merge topic 'doc-map-config-prop-example'Brad King2017-03-061-0/+45
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 957bdb9e Help: Add example to MAP_IMPORTED_CONFIG_<CONFIG> docs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !545
| * | | Help: Add example to MAP_IMPORTED_CONFIG_<CONFIG> docsRuslan Baratov2017-03-061-0/+45
| | | |
* | | | Merge topic 'FindVulkan-fix-win-32'Brad King2017-03-061-0/+1
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | 723955cd FindVulkan: Fix for SDK versions < 1.0.42 on 32-bit Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !549
| * | | FindVulkan: Fix for SDK versions < 1.0.42 on 32-bit WindowsMatthäus G. Chajdas2017-03-061-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | Merge topic 'FindHDF5-fix-definitions'Brad King2017-03-061-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ea2a8dd2 FindHDF5: Restore `-D` in HDF5_DEFINITIONS Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !554
| * | | | FindHDF5: Restore `-D` in HDF5_DEFINITIONSKris Thielemans2017-03-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | Merge topic 'binaries-from-gitlab-repo'Brad King2017-03-062-3/+11
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9a1ee04d Utilities/Release: Fetch from gitlab.kitware.com repository Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !547
| * | | | | Utilities/Release: Fetch from gitlab.kitware.com repositoryBrad King2017-03-032-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | CMake Nightly Date StampKitware Robot2017-03-061-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2017-03-051-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2017-03-041-1/+1
|/ / / / /
* | | | | Merge topic 'developer-setup'Brad King2017-03-032-12/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6cd3079c SetupForDevelopment: Drop cmake.org remote repo configuration Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !546
| * | | | | SetupForDevelopment: Drop cmake.org remote repo configurationBrad King2017-03-032-12/+2
|/ / / / / | | | | | | | | | | | | | | | | | | | | We no longer push directly to cmake.org repositories. Changes now go through https://gitlab.kitware.com/cmake/cmake for integration.
* | | | | Merge topic 'doc-development-process'Brad King2017-03-035-1/+345
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | CONTRIBUTING: Add link to review process documentBrad King2017-03-031-0/+3
| | | | | |
| * | | | | CONTRIBUTING: Add link to development documentation READMEBrad King2017-03-031-0/+5
| | | | | |
| * | | | | CONTRIBUTING: Add note about running developer setup scriptBrad King2017-03-031-0/+2
| | | | | |
| * | | | | Help/dev: Document the CMake Review ProcessBrad King2017-03-032-0/+316
| | | | | |
| * | | | | Help/dev: Exclude this directory from user-facing documentationBrad King2017-03-013-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Teach Sphinx and our own install rules to skip a `Help/dev` directory. This will give us a place to put developer-only documentation that should not be included in the user-facing documentation. Add a placeholder README.
* | | | | | Merge branch 'release'Brad King2017-03-030-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | CMake 3.8.0-rc2v3.8.0-rc2Brad King2017-03-031-1/+1
| | | | | |
* | | | | | Merge branch 'release'Brad King2017-03-030-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch 'FindJNI-archlinux-jvm-paths' into releaseBrad King2017-03-031-0/+5
| |\ \ \ \ \
* | \ \ \ \ \ Merge topic 'FindJNI-archlinux-jvm-paths'Brad King2017-03-031-0/+5
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | d0ada3e2 FindJNI: Add jvm paths for Arch Linux
| * | | | | | FindJNI: Add jvm paths for Arch LinuxKitsu2017-03-031-0/+5
| | | | | | |
* | | | | | | Merge branch 'release'Brad King2017-03-030-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge branch 'FindVulkan-update' into releaseBrad King2017-03-021-2/+6
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |