summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | | | Merge topic 'cmRemoveDuplicates'Brad King2018-05-303-42/+39
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6d7c074055 cmAlgorithms: Speed up cmRemoveDuplicates method 281f59536f IWYU: Define a macro to tell code it is preprocessing for iwyu Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2101
| * | | | cmAlgorithms: Speed up cmRemoveDuplicates methodLe Minh Phuc2018-05-252-41/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use a hash table instead of a sorted vector to track entries. Co-authored-by: Chu Qinghao <me@qinghao1.com>
| * | | | IWYU: Define a macro to tell code it is preprocessing for iwyuBrad King2018-05-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are some cases where satisfying IWYU breaks compilation, such as forward-declaring the `std::hash<>` template with C++ standard libraries that use an inline namespace inside `std`. Define a macro during include-what-you-use preprocessing so that code can adapt.
* | | | | Merge topic 'clarify-topic-rename'Brad King2018-05-301-2/+5
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | 82e01cbfc5 Help: Clarify usage of Topic-rename Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2110
| * | | | Help: Clarify usage of Topic-renameCraig Scott2018-05-291-2/+5
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2018-05-301-1/+1
| | | | |
* | | | | Merge topic 'parallel_build_option'Brad King2018-05-2950-100/+424
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1ab3881ec9 cmake: Add options for parallel builds to --build mode Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Henry Schreiner <henryschreineriii@gmail.com> Merge-request: !1962
| * | | | | cmake: Add options for parallel builds to --build modeFlorian Maushart2018-05-2550-100/+424
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While we already support `cmake --build . -- -j`, the options after `--` are specific to the native build tool. Add new options `--parallel [<N>]` and `-j [<N>]` to abstract this and map to the proper option for the native build tool.
* | | | | | Merge topic 'cuda-unused-placeholder'Brad King2018-05-292-7/+7
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | edf0ea9bb2 CUDA: Drop unused/broken platform link flags placeholder Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2108
| * | | | | CUDA: Drop unused/broken platform link flags placeholderBrad King2018-05-252-7/+7
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `<CMAKE_CUDA_LINK_FLAGS>` placeholder in CUDA rule variables comes from the `<CMAKE_CXX_LINK_FLAGS>` placeholder from which the CUDA rule variables were originally derived. It is not a public interface for adding link flags so no projects should be using it. It is needed for platform information modules to specify platform-specific link flags for the language. None of our platform modules set it, so it is unused. Furthermore, it is broken as currently implemented. Some of the contexts in which it is used need `-Xlinker` and some do not. Therefore it is not possible to use the placeholder at all. Simply remove it for now. If some need for platform-specific CUDA link flags arises a new solution will be needed.
* | | | | Merge topic 'vs-raii-implement'Brad King2018-05-291-130/+42
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e7e25c6cb6 cmVisualStudio10TargetGenerator: Remove empty Elem::EndElement() 726c090297 cmVisualStudio10TargetGenerator: close XML tag in Elem destructor Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2109
| * | | | | cmVisualStudio10TargetGenerator: Remove empty Elem::EndElement()Vitaly Stakhovsky2018-05-251-125/+31
| | | | | | | | | | | | | | | | | | | | | | | | The method no longer does anything. Remove it and remove calls to it.
| * | | | | cmVisualStudio10TargetGenerator: close XML tag in Elem destructorVitaly Stakhovsky2018-05-251-6/+12
| | | | | | | | | | | | | | | | | | | | | | | | RAII actually implemented; EndElement() still kept to avoid major reformatting
* | | | | | Merge topic 'bootstrap_ccache_tweak'Brad King2018-05-291-4/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1f994d9fdc bootstrap: Use ccache in script-generated makefile Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2107
| * | | | | | bootstrap: Use ccache in script-generated makefileShane Parris2018-05-251-4/+6
| | | | | | |
* | | | | | | Merge topic 'doxygen-all'Craig Scott2018-05-293-2/+62
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7b2f440e2b FindDoxygen: Add tests for ALL option 79b29b732c FindDoxygen: add optional ALL argument Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2099
| * | | | | | | FindDoxygen: Add tests for ALL optionCraig Scott2018-05-272-0/+52
| | | | | | | |