Commit Graph

39780 Commits

Author SHA1 Message Date
Brad King 1bbee86bf2 Merge topic 'WriteBasicConfigFile_tests'
56f45bb79d Refactor write_basic_package_version_file tests

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2122
2018-06-04 09:52:00 -04:00
Brad King fbd34ecd35 Merge topic 'gnu-CMAKE_LANG_COMPILER_PREDEFINES_COMMAND'
caa138c1a5 Move GNU COMPILER_PREDEFINES_COMMAND from Platform to Compiler

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2121
2018-06-04 09:51:31 -04:00
Brad King 003c30fa18 Merge topic 'libarchive-ssize_t'
6d8ae1e6e4 cmSystemTools: Restore compilation with libarchive versions below 3.3.1

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2126
2018-06-04 09:49:13 -04:00
Brad King 5a9a3d28a4 Merge topic 'update-kwsys'
81870f1159 Merge branch 'upstream-KWSys' into update-kwsys
3af8c7715b KWSys 2018-06-01 (8ef62b28)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2125
2018-06-04 09:45:56 -04:00
Kitware Robot f70da4ed83 CMake Nightly Date Stamp 2018-06-04 00:01:05 -04:00
Kitware Robot 72d5f23caf CMake Nightly Date Stamp 2018-06-03 00:01:05 -04:00
Kitware Robot 4b5d2249bf CMake Nightly Date Stamp 2018-06-02 00:01:07 -04:00
Brad King 6d8ae1e6e4 cmSystemTools: Restore compilation with libarchive versions below 3.3.1
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.
2018-06-01 13:27:08 -04:00
Brad King 81870f1159 Merge branch 'upstream-KWSys' into update-kwsys
* upstream-KWSys:
  KWSys 2018-06-01 (8ef62b28)
2018-06-01 12:54:13 -04:00
KWSys Upstream 3af8c7715b KWSys 2018-06-01 (8ef62b28)
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
2018-06-01 12:54:12 -04:00
Brad King eed0df951d Merge topic 'clang-format-6.0'
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
2018-06-01 12:52:38 -04:00
Kitware Robot d7204e649e Revise C++ coding style using clang-format-6.0
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.
2018-06-01 09:53:42 -04:00
Brad King 12fed3edb1 Empty commit at end of history preceding clang-format-6.0 style transition
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.
2018-06-01 09:52:13 -04:00
Brad King 523c443d13 clang-format.bash: update to clang-format-6.0
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.
2018-06-01 09:52:02 -04:00
Brad King eb7ec19c1c clang-format: Add comments to suppress some formatting
Preserve manually-formatted blocks.
2018-06-01 09:52:02 -04:00
Brad King b67a5bf175 Tests/VSWinStorePhone: Do not format managed source 2018-06-01 09:52:02 -04:00
Brad King b671e4799f Merge topic 'update-prebuilt-openssl'
86121ffd1c Utilities/Release: Update to openssl-1.1.0h

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2119
2018-06-01 09:50:18 -04:00
Brad King 4144b78013 Merge topic 'autogen_autorcc_multi_config'
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
2018-06-01 09:49:37 -04:00
Brad King 5ba76299f8 Merge topic 'nolint_typedef_testdriver'
bbbcbb1a48 TestDriver: Disable clang-tidy 'modernize-use-using'

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2118
2018-06-01 09:48:51 -04:00
Brad King b1662b1f96 Merge topic 'alsa-target'
1c5b1ad408 FindALSA: add testcase
6a64292fa7 FindALSA: reformat docs
1c87844856 FindALSA: provide an imported target

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2112
2018-06-01 09:48:04 -04:00
Daniele E. Domenichelli 56f45bb79d Refactor write_basic_package_version_file tests 2018-06-01 14:24:50 +02:00
Sebastian Holtermann caa138c1a5 Move GNU COMPILER_PREDEFINES_COMMAND from Platform to Compiler
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).
2018-06-01 09:21:06 +02:00
Kitware Robot 6292873045 CMake Nightly Date Stamp 2018-06-01 00:01:05 -04:00
Brad King 86121ffd1c Utilities/Release: Update to openssl-1.1.0h
Update the prebuilt binary build configurations for machines where
we build our own OpenSSL library to use a newer version.
2018-05-31 11:24:41 -04:00
Brad King e4f170b196 Merge branch 'release-3.11' 2018-05-31 10:26:45 -04:00
Brad King 8738eba336 CMake 3.11.3 v3.11.3 2018-05-31 09:04:20 -04:00
Brad King e9648106a8 Merge branch 'release-3.11' 2018-05-31 09:00:13 -04:00
Brad King f5ca5850df Merge topic 'create_test_sourcelist-strcpy'
3af0438b4b TestDriver: Replace strncpy with strcpy

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2115
2018-05-31 08:51:05 -04:00
Brad King d155b536cb Merge topic 'cpack-wix-sources'
ca49f1a8e4 CPack: Fix cross-compilation of WiX generator

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2116
2018-05-31 08:50:15 -04:00
Brad King 61c4858c37 Merge topic 'revert-windows_symlinks'
83630d4918 cmSystemTools: Revert GetRealPath implementation on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2114
2018-05-31 08:48:36 -04:00
Sylvain Joubert bbbcbb1a48 TestDriver: Disable clang-tidy 'modernize-use-using' 2018-05-31 13:51:40 +02:00
Rolf Eike Beer 1c5b1ad408 FindALSA: add testcase 2018-05-31 09:35:53 +02:00
Rolf Eike Beer 6a64292fa7 FindALSA: reformat docs 2018-05-31 09:35:53 +02:00
Rolf Eike Beer 1c87844856 FindALSA: provide an imported target 2018-05-31 09:35:53 +02:00
Kitware Robot 0b32ae944f CMake Nightly Date Stamp 2018-05-31 00:01:07 -04:00
Sebastian Holtermann 5852acffa4 Autogen: Add AUTORCC configuration change test 2018-05-30 17:45:01 +02:00
Sebastian Holtermann 41685c8ba0 Autogen: Let AUTORCC generate output for all configurations
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
2018-05-30 17:45:01 +02:00
Sebastian Holtermann 2930a198f6 Autogen: Add lock file to AUTORCC commands
By using a per .qrc lock file in AUTORCC, the same
`cmake -E cmake_autorcc ...` command can be called concurrently.
2018-05-30 17:45:01 +02:00
Brad King 958191a95c Merge topic 'vs-toolset-version'
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
2018-05-30 10:19:21 -04:00
Brad King fdb9d1ba04 Merge topic 'cmRemoveDuplicates'
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
2018-05-30 09:56:00 -04:00
Brad King f2201451df Merge branch 'create_test_sourcelist-strcpy' into release-3.11
Merge-request: !2115
2018-05-30 09:54:12 -04:00
Brad King f393602131 Merge branch 'cpack-wix-sources' into release-3.11
Merge-request: !2116
2018-05-30 09:53:54 -04:00
Sander Vrijders 3af0438b4b TestDriver: Replace strncpy with strcpy
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
2018-05-30 09:45:57 -04:00
Brad King ca49f1a8e4 CPack: Fix cross-compilation of WiX generator
Fix the case of the path to source files so it works on case-sensitive
filesystems.

Fixes: #18042
2018-05-30 09:39:16 -04:00
Brad King e21245ecaf Merge topic 'clarify-topic-rename'
82e01cbfc5 Help: Clarify usage of Topic-rename

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2110
2018-05-30 09:23:39 -04:00
Kitware Robot 392f223d60 CMake Nightly Date Stamp 2018-05-30 00:01:05 -04:00
Craig Scott 82e01cbfc5 Help: Clarify usage of Topic-rename 2018-05-30 06:56:11 +10:00
Brad King 058ea79ff2 Merge branch 'revert-windows_symlinks' into release-3.11
Merge-request: !2114
2018-05-29 14:07:29 -04:00
Brad King 83630d4918 cmSystemTools: Revert GetRealPath implementation on Windows
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
2018-05-29 14:00:33 -04:00
Basil Fierz 5f13168419 VS: Add option to select the version of the toolset used by VS 2017
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
2018-05-29 10:12:59 -04:00