summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Help: Organize and revise 3.12 release notesBrad King2018-06-041-163/+208
| | | | | Add section headers similar to the 3.11 release notes and move each individual bullet into an appropriate section. Revise a few bullets.
* Help: Consolidate 3.12 release notesBrad King2018-06-0459-361/+256
| | | | | Run the `Utilities/Release/consolidate-relnotes.bash` script to move notes from `Help/release/dev/*` into `Help/release/3.12.rst`.
* Merge topic 'fix-ti-c-standard'Brad King2018-06-043-0/+13
|\ | | | | | | | | | | | | 9e27881bb1 TI: Add support for C language standards Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2131
| * TI: Add support for C language standardsArnaud Gelas2018-06-043-0/+13
| | | | | | | | | | | | Set C90 and C99 compile options for TI compiler. Fixes: #18061
* | Merge topic 'WriteBasicConfigFile_tests'Brad King2018-06-041-239/+894
|\ \ | | | | | | | | | | | | | | | | | | 56f45bb79d Refactor write_basic_package_version_file tests Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2122
| * | Refactor write_basic_package_version_file testsDaniele E. Domenichelli2018-06-011-239/+894
| | |
* | | Merge topic 'gnu-CMAKE_LANG_COMPILER_PREDEFINES_COMMAND'Brad King2018-06-042-1/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | caa138c1a5 Move GNU COMPILER_PREDEFINES_COMMAND from Platform to Compiler Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2121
| * | | Move GNU COMPILER_PREDEFINES_COMMAND from Platform to CompilerSebastian Holtermann2018-06-012-1/+2
| |/ / | | | | | | | | | | | | | | | | | | | | | Moves `CMAKE_${lang}_COMPILER_PREDEFINES_COMMAND` from linux specific [Modules/Platform/Linux-GNU.cmake](Modules/Platform/Linux-GNU.cmake) to [Modules/Compiler/GNU.cmake](Modules/Compiler/GNU.cmake). This enables compiler predefines generation (in AUTOMOC) on all platforms that run gcc (and clang).
* | | Merge topic 'libarchive-ssize_t'Brad King2018-06-041-1/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 6d8ae1e6e4 cmSystemTools: Restore compilation with libarchive versions below 3.3.1 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2126
| * | | cmSystemTools: Restore compilation with libarchive versions below 3.3.1Brad King2018-06-011-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit a203fcc63d (cmake: Teach '-E tar' to report errors copying data, 2018-05-16) we introduced use of `la_ssize_t` but that was not available until libarchive 3.3.1. Switch to the `__LA_SSIZE_T` macro we use elsewhere.
* | | | Merge topic 'update-kwsys'Brad King2018-06-0460-1644/+1675
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | 81870f1159 Merge branch 'upstream-KWSys' into update-kwsys 3af8c7715b KWSys 2018-06-01 (8ef62b28) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2125
| * | | Merge branch 'upstream-KWSys' into update-kwsysBrad King2018-06-0160-1644/+1675
| |\ \ \ | | |/ / | |/| | | | | | | | | | * upstream-KWSys: KWSys 2018-06-01 (8ef62b28)
| | * | KWSys 2018-06-01 (8ef62b28)KWSys Upstream2018-06-0160-1644/+1675
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://gitlab.kitware.com/utils/kwsys.git at commit 8ef62b289e0a99856893ef49106c2b2d94e9dd0c (master). Upstream Shortlog ----------------- Brad King (2): 6b9c233c clang-format.bash: update to clang-format-6.0 b7a341cf Empty commit at end of history preceding clang-format-6.0 style transition Kitware Robot (1): 828b6837 Revise C++ coding style using clang-format-6.0
* | | | CMake Nightly Date StampKitware Robot2018-06-041-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2018-06-031-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2018-06-021-1/+1
|/ / /
* | | Merge topic 'clang-format-6.0'Brad King2018-06-01458-3207/+3775
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d7204e649e Revise C++ coding style using clang-format-6.0 12fed3edb1 Empty commit at end of history preceding clang-format-6.0 style transition 523c443d13 clang-format.bash: update to clang-format-6.0 eb7ec19c1c clang-format: Add comments to suppress some formatting b67a5bf175 Tests/VSWinStorePhone: Do not format managed source Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Sebastian Holtermann <sebholt@xwmw.org> Merge-request: !2123
| * | | Revise C++ coding style using clang-format-6.0Kitware Robot2018-06-01445-3187/+3740
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Run the `clang-format.bash` script to update all our C and C++ code to a new style defined by `.clang-format`. Use `clang-format` version 6.0. * If you reached this commit for a line in `git blame`, re-run the blame operation starting at the parent of this commit to see older history for the content. * See the parent commit for instructions to rebase a change across this style transition commit.
| * | | Empty commit at end of history preceding clang-format-6.0 style transitionBrad King2018-06-010-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is an empty commit that precedes an automatic application of clang-format-6.0 to update the C++ style of our entire source tree. This may be helpful to rebase a topic branch that was originally based on a commit preceding the transition. One may first rebase the topic on this commit. Then use one of the following approaches. * Rewrite the topic, including this commit, using `git filter-branch` `--tree-filter` with `clang-format.bash` to update the style in every commit. Rebase the revised topic, excluding the rewrite of this commit, on the style transition commit. OR * Add a `.git/info/grafts` entry to change the parent of the first commit in the topic from this commit to the style transition commit. Rewrite the topic using `git filter-branch --tree-filter` with `clang-format.bash` to update the style in every commit. Then remove the graft, which was resolved by the filter. See `git help filter-branch` and `git help repository-layout` for details.
| * | | clang-format.bash: update to clang-format-6.0Brad King2018-06-0113-20/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update `.clang-format` with configuration to make the 6.0 format as close as possible to what 3.8 produced before. Then revise the style: * Indent preprocessor directives (a feature new since 3.8) * Add a newline and indentation before inheritance `:` and `,` Rename the Git attribute identifying the format to include the clang-format version number: `format.clang-format-6.0`. This will aid external infrastructure in knowing what version of the tool to run.
| * | | clang-format: Add comments to suppress some formattingBrad King2018-06-011-1/+2
| | | | | | | | | | | | | | | | Preserve manually-formatted blocks.
| * | | Tests/VSWinStorePhone: Do not format managed sourceBrad King2018-06-011-0/+1
|/ / /
* | | Merge topic 'update-prebuilt-openssl'Brad King2018-06-011-3/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 86121ffd1c Utilities/Release: Update to openssl-1.1.0h Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2119
| * | | Utilities/Release: Update to openssl-1.1.0hBrad King2018-05-311-3/+3
| | | | | | | | | | | | | | | | | | | | Update the prebuilt binary build configurations for machines where we build our own OpenSSL library to use a newer version.
* | | | Merge topic 'autogen_autorcc_multi_config'Brad King2018-06-0117-11/+170
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5852acffa4 Autogen: Add AUTORCC configuration change test 41685c8ba0 Autogen: Let AUTORCC generate output for all configurations 2930a198f6 Autogen: Add lock file to AUTORCC commands Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2117
| * | | | Autogen: Add AUTORCC configuration change testSebastian Holtermann2018-05-3011-0/+94
| | | | |
| * | | | Autogen: Let AUTORCC generate output for all configurationsSebastian Holtermann2018-05-301-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For multi configuration generators let AUTORCC generate the rcc output for all configurations. This is a workaround for the incomplete `$<CONFIG>` support in the DEPENDS and OUTPUT clauses of a custom_command/custom_target. Since we can't depend on the per-config rcc output file we somehow must ensure the successful rcc build for one configuration doesn't shadow the need to rcc rebuild for a second configuration. Closes #18006
| * | | | Autogen: Add lock file to AUTORCC commandsSebastian Holtermann2018-05-306-9/+62
| | | | | | | | | | | | | | | | | | | | | | | | | By using a per .qrc lock file in AUTORCC, the same `cmake -E cmake_autorcc ...` command can be called concurrently.
* | | | | Merge topic 'nolint_typedef_testdriver'Brad King2018-06-011-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bbbcbb1a48 TestDriver: Disable clang-tidy 'modernize-use-using' Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2118
| * | | | | TestDriver: Disable clang-tidy 'modernize-use-using'Sylvain Joubert2018-05-311-2/+2
| | | | | |
* | | | | | Merge topic 'alsa-target'Brad King2018-06-016-9/+74
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1c5b1ad408 FindALSA: add testcase 6a64292fa7 FindALSA: reformat docs 1c87844856 FindALSA: provide an imported target Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2112
| * | | | | FindALSA: add testcaseRolf Eike Beer2018-05-314-0/+40
| | | | | |
| * | | | | FindALSA: reformat docsRolf Eike Beer2018-05-311-9/+16
| | | | | |
| * | | | | FindALSA: provide an imported targetRolf Eike Beer2018-05-312-0/+18
| |/ / / /
* | | | | CMake Nightly Date StampKitware Robot2018-06-011-1/+1
| |_|/ / |/| | |
* | | | Merge branch 'release-3.11'Brad King2018-05-310-0/+0
|\ \ \ \
| * | | | CMake 3.11.3v3.11.3Brad King2018-05-311-1/+1
| | | | |
* | | | | Merge branch 'release-3.11'Brad King2018-05-310-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'create_test_sourcelist-strcpy' into release-3.11Brad King2018-05-301-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !2115
| * \ \ \ \ Merge branch 'cpack-wix-sources' into release-3.11Brad King2018-05-301-2/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !2116
| * \ \ \ \ \ Merge branch 'revert-windows_symlinks' into release-3.11Brad King2018-05-294-8/+22
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !2114
* | \ \ \ \ \ \ Merge topic 'create_test_sourcelist-strcpy'Brad King2018-05-311-1/+1
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3af0438b4b TestDriver: Replace strncpy with strcpy Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2115
| * | | | | | | TestDriver: Replace strncpy with strcpySander Vrijders2018-05-301-1/+1
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GCC 8.1.0 now gives an error if `strncpy` is called with a bound depending on the length of the source argument. Replace `strncpy` with `strcpy` as the length is known a priori. Fixes: #18038
* | | | | | | Merge topic 'cpack-wix-sources'Brad King2018-05-311-2/+2
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ca49f1a8e4 CPack: Fix cross-compilation of WiX generator Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2116
| * | | | | | CPack: Fix cross-compilation of WiX generatorBrad King2018-05-301-2/+2
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the case of the path to source files so it works on case-sensitive filesystems. Fixes: #18042
* | | | | | Merge topic 'revert-windows_symlinks'Brad King2018-05-314-8/+22
|\ \ \ \ \ \ | | |/ / / / | |/| / / / | |_|/ / / |/| | | | | | | | | | | | | | 83630d4918 cmSystemTools: Revert GetRealPath implementation on Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2114
| * | | | cmSystemTools: Revert GetRealPath implementation on WindowsBrad King2018-05-294-8/+22
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The use of `uv_fs_realpath` introduced by commit v3.11.0-rc1~445^2~1 (cmSystemTools: Implement GetRealPath on Windows, 2017-10-02) causes `subst` drives to be expanded on Windows, breaking existing use cases. Revert its use until an alternative implementation can be chosen. Preserve the behavior introduced by commit v3.11.0-rc1~445^2 (cmTimestamp: For symlinks switch to timestamp of resolved path, 2017-10-02) by retaining use of `uv_fs_realpath` in a function of a different name. Fixes: #18033 Issue: #17206
* | | | CMake Nightly Date StampKitware Robot2018-05-311-1/+1
| | | |
* | | | Merge topic 'vs-toolset-version'Brad King2018-05-3022-0/+191
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5f13168419 VS: Add option to select the version of the toolset used by VS 2017 Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Francisco Facioni <fran6co@gmail.com> Merge-request: !2093
| * | | | VS: Add option to select the version of the toolset used by VS 2017Basil Fierz2018-05-2922-0/+191
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add new `version=` parameter in the toolset setting to select the version. Add variable `CMAKE_VS_PLATFORM_TOOLSET_VERSION` to hold the version, if one is set (blank indicates default). Fixes: #17549