Commit Graph

39751 Commits

Author SHA1 Message Date
Daniele E. Domenichelli 56f45bb79d Refactor write_basic_package_version_file tests 2018-06-01 14:24:50 +02:00
Kitware Robot 6292873045 CMake Nightly Date Stamp 2018-06-01 00:01:05 -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
Kitware Robot 0b32ae944f CMake Nightly Date Stamp 2018-05-31 00:01:07 -04: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
Brad King f248f8ad78 Merge topic 'parallel_build_option'
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
2018-05-29 10:05:09 -04:00
Brad King 42752d0c11 Merge topic 'cuda-unused-placeholder'
edf0ea9bb2 CUDA: Drop unused/broken platform link flags placeholder

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2108
2018-05-29 10:02:18 -04:00
Brad King a543a233a2 Merge topic 'vs-raii-implement'
e7e25c6cb6 cmVisualStudio10TargetGenerator: Remove empty Elem::EndElement()
726c090297 cmVisualStudio10TargetGenerator: close XML tag in Elem destructor

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2109
2018-05-29 09:59:58 -04:00
Brad King 70b930db38 Merge topic 'bootstrap_ccache_tweak'
1f994d9fdc bootstrap: Use ccache in script-generated makefile

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2107
2018-05-29 09:58:50 -04:00
Craig Scott 4e890800eb Merge topic 'doxygen-all'
7b2f440e2b FindDoxygen: Add tests for ALL option
79b29b732c FindDoxygen: add optional ALL argument

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2099
2018-05-29 05:25:04 -04:00
Kitware Robot 11818c5fc1 CMake Nightly Date Stamp 2018-05-29 00:01:04 -04:00
Kitware Robot 965c79cc90 CMake Nightly Date Stamp 2018-05-28 00:01:04 -04:00
Craig Scott 3cc081654d Merge topic 'cmake-D-option-help'
42738e5075 Help: Update description of the -D option to CMake

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2105
2018-05-27 04:40:34 -04:00
Craig Scott 7b2f440e2b FindDoxygen: Add tests for ALL option 2018-05-27 18:18:40 +10:00
Kitware Robot caab746548 CMake Nightly Date Stamp 2018-05-27 00:01:06 -04:00
Kitware Robot 64946fff30 CMake Nightly Date Stamp 2018-05-26 00:01:10 -04:00
Vitaly Stakhovsky e7e25c6cb6 cmVisualStudio10TargetGenerator: Remove empty Elem::EndElement()
The method no longer does anything.  Remove it and remove calls to it.
2018-05-25 13:04:56 -04:00
Le Minh Phuc 6d7c074055 cmAlgorithms: Speed up cmRemoveDuplicates method
Use a hash table instead of a sorted vector to track entries.

Co-authored-by: Chu Qinghao <me@qinghao1.com>
2018-05-25 12:49:01 -04:00
Brad King 281f59536f IWYU: Define a macro to tell code it is preprocessing for iwyu
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.
2018-05-25 12:46:19 -04:00
Brad King edf0ea9bb2 CUDA: Drop unused/broken platform link flags placeholder
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.
2018-05-25 10:03:03 -04:00
Florian Maushart 1ab3881ec9 cmake: Add options for parallel builds to --build mode
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.
2018-05-25 09:42:20 -04:00
Shane Parris 1f994d9fdc bootstrap: Use ccache in script-generated makefile 2018-05-25 09:29:53 -04:00
Brad King 46b26b52c9 Merge topic 'FindPerl-strawberry'
b37d583d5c FindPerl: Add support for Strawberry Perl

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2102
2018-05-25 09:29:12 -04:00
Vitaly Stakhovsky 726c090297 cmVisualStudio10TargetGenerator: close XML tag in Elem destructor
RAII actually implemented; EndElement() still kept to avoid major reformatting
2018-05-25 09:28:54 -04:00
Brad King 266fd71654 Merge topic 'FindLua-conventional-paths'
f5d19260f9 FindLua: Search for lua.h using more conventional paths
9455512d22 FindLua: Add tests for this module

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2095
2018-05-25 09:26:21 -04:00
Brad King 9b5161e24f Merge topic 'vs-scope'
45c4a75d27 cmVisualStudio10TargetGenerator: make sure each Elem has right scope

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2096
2018-05-25 09:25:17 -04:00
Brad King cf723c493e Merge topic 'FindODBC-module'
357db10bd1 FindODBC: Add module to search for ODBC library

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2069
2018-05-25 09:23:52 -04:00
Kitware Robot a9bab1443e CMake Nightly Date Stamp 2018-05-25 00:01:04 -04:00
Raul Laasner 42738e5075 Help: Update description of the -D option to CMake
Fixes #18021
2018-05-24 17:50:33 -04:00
Alexander Grund f5d19260f9 FindLua: Search for lua.h using more conventional paths
Do not constrain the search to `include/*`.  To provide compatibility
the foreach-loop is still used. However `include/xxx` and `xxx` is now
both searched.  This honors now e.g. CMAKE_INCLUDE_PATH.

Fixes: #17999
2018-05-24 11:20:09 -04:00
Alexander Grund 9455512d22 FindLua: Add tests for this module 2018-05-24 11:19:40 -04:00
Lauri b37d583d5c FindPerl: Add support for Strawberry Perl
Fixes: #18027
2018-05-24 09:58:27 -04:00
Brad King 2f8230b052 Merge topic 'revise-case-insensitive-command'
b1a05d6c76 Revise implementation of case-insensitive command names

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2024
2018-05-24 09:56:23 -04:00
Brad King 2eb9852d7b Merge topic 'FindBZip2-imported-include-dirs'
0887c993aa FindBZip2: Populate BZIP2_INCLUDE_DIRS result variable
a8bf1ea5b7 FindBZip2: Format result variable docs as definition list

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2097
2018-05-24 09:55:46 -04:00