Commit Graph

42453 Commits

Author SHA1 Message Date
Brad King
7abe332ced Merge topic 'autogen_cache_binary_checks'
b5befac154 Autogen: Use output caching GetExecutableTestOutput
a4e01d6707 Autogen: Add output caching GetExecutableTestOutput

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2990
2019-02-20 08:55:25 -05:00
Brad King
fcdd6efb72 Merge topic 'vs-win-sdk'
4dab8e69bd VS: Tell VS 2019 to use Windows SDK 8.1 explicitly when needed
35bf9ded3b VS: Factor out a method to set the Windows SDK version internally

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2989
2019-02-20 08:54:36 -05:00
Brad King
85d779442b Merge topic 'asm-no-slash-question'
b186329d3d Use -? instead of /? to test compiler for MSVC-like command-line support

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2984
2019-02-20 08:53:41 -05:00
Kitware Robot
18ff514b52 CMake Nightly Date Stamp 2019-02-20 00:01:08 -05:00
Sebastian Holtermann
b5befac154 Autogen: Use output caching GetExecutableTestOutput
Use the output caching cmQtAutoGenGlobalInitializer::GetExecutableTestOutput
method to avoid identical calls to moc, uic and rcc.

Closes #18947
2019-02-19 13:11:44 -05:00
Sebastian Holtermann
a4e01d6707 Autogen: Add output caching GetExecutableTestOutput
This adds the cmQtAutoGenGlobalInitializer::GetExecutableTestOutput method
which caches the output of the called executable and returns the cached value
on any subsequent call.
2019-02-19 13:11:44 -05:00
Brad King
4dab8e69bd VS: Tell VS 2019 to use Windows SDK 8.1 explicitly when needed
VS 2019 does not default to the 8.1 SDK as VS 2017 and VS 2015 did.
When `CMAKE_SYSTEM_VERSION` is 8.1 or lower, select the 8.1 SDK
explicitly.

Fixes: #18927
2019-02-19 09:31:50 -05:00
Brad King
35bf9ded3b VS: Factor out a method to set the Windows SDK version internally 2019-02-19 09:31:50 -05:00
Brad King
7574e16096 Merge branch 'release-3.14' 2019-02-19 07:57:42 -05:00
Brad King
2bff8513f2 Merge topic 'modernize-for-loops-c-arrays'
706b93fa55 Modernize: C-arrays and loops over them

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2951
2019-02-19 07:56:41 -05:00
Craig Scott
9cab31cc79 Merge topic 'readme-msys2'
55ad9304ed README: Explain how to bootstrap via MSYS2 on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Bartosz <gang65@poczta.onet.pl>
Merge-request: !2983
2019-02-19 07:56:06 -05:00
Brad King
2dd2079152 Merge topic 'fix-legacy-implicit-includes'
890bae524c Do not explicitly report "standard" include directories as implicit
5c171ca898 Restore unconditional use of "standard" include directories
9502276f82 Prefix implicit include directories with sysroot on construction

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2981
2019-02-19 07:54:57 -05:00
Brad King
bc34282da6 Merge topic 'FindBoost-layout-tagged'
bee6597ac5 FindBoost: Find boost libraries built with --layout=tagged

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2961
2019-02-19 07:53:47 -05:00
Brad King
13f020198f Merge branch 'fix-legacy-implicit-includes' into release-3.14
Merge-request: !2981
2019-02-19 07:50:07 -05:00
Brad King
7814796e07 Merge branch 'FindBoost-layout-tagged' into release-3.14
Merge-request: !2961
2019-02-19 07:49:26 -05:00
Brad King
b186329d3d Use -? instead of /? to test compiler for MSVC-like command-line support
MS-style command-line tools accept either `/` or `-` for command-line
options.  Prefer `-` over `/` so that non-MS tools do not treat it as a
path.

Fixes: #18941
2019-02-19 07:29:27 -05:00
Brad King
55ad9304ed README: Explain how to bootstrap via MSYS2 on Windows
Inspired-by: Bartosz Kosiorek <bartosz.kosiorek@tomtom.com>
2019-02-19 07:10:59 -05:00
Kitware Robot
2a1f661791 CMake Nightly Date Stamp 2019-02-19 00:01:06 -05:00
Brad King
890bae524c Do not explicitly report "standard" include directories as implicit
In commit 1293ed8507 (ParseImplicitIncludeInfo: keep implicit incl.
consistent when rerunning cmake, 2019-01-30, v3.14.0-rc1~26^2) we did
not account for `CMAKE_<LANG>_STANDARD_INCLUDE_DIRECTORIES`.  This
variable lets platform modules or toolchain files specify directories
that are to be explicitly passed as standard include directories.  These
include directories are used by the test project from which we extract
implicit include directories so they appear in the parsed results
whether or not the compiler really considers them implicit.  Exclude
these entries from the computed implicit include directories since they
are not actually implied by the compiler when we invoke it with
"standard" include directories passed explicitly.

Instead teach the build system generators to treat the "standard"
directories as implicit for purposes of excluding them from appearing
earlier in the compiler command line due to `include_directories` and
`target_include_directories` calls.

Issue: #18936, #18944
2019-02-18 17:12:14 -05:00
Brad King
5c171ca898 Restore unconditional use of "standard" include directories
`CMAKE_<LANG>_STANDARD_INCLUDE_DIRECTORIES` is meant to unconditionally
add explicitly specified include directories to compile lines.  In
commit 5f34bdc7f9 (cmLocalGenerator: Refactor
`GetIncludeDirectoriesImplicit` method, 2019-01-25, v3.14.0-rc1~65^2~1)
a condition was accidentally added to exclude implicit include
directories.  Drop that condition.

Fixes: #18936
2019-02-18 17:10:07 -05:00
Brad King
9502276f82 Prefix implicit include directories with sysroot on construction
Since commit 7cd65c97fa (Add CMAKE_SYSROOT variable to set --sysroot
when cross compiling., 2013-04-13, v3.0.0-rc1~342^2) we have prefixed
the value of `CMAKE_SYSROOT` to implicit include directories.  This was
done because we hard-coded `/usr/include` as an implicit include
directory without accounting for the sysroot.  Instead we should prefix
the hard-coded paths when they are constructed.  Update the
`Platform/UnixPaths` module to do this as `Platform/Darwin` already
does.

Since commit 5990ecb741 (Compute implicit include directories from
compiler output, 2018-12-07, v3.14.0-rc1~108^2) the values of the
`CMAKE_<LANG>_IMPLICIT_INCLUDE_DIRECTORIES` variables are computed from
a real compiler invocation so they already account for the sysroot
prefix.  In commit 6fc3382944 (Update logic for sysroot in detected
implicit include directories, 2019-02-13, v3.14.0-rc2~6^2) we attempted
to apply the prefix conditionally, but that is incorrect because the
compiler's real implicit include directories are not all under the
sysroot.  Instead assume that all implicit include directories in
`CMAKE_<LANG>_IMPLICIT_INCLUDE_DIRECTORIES` already have the sysroot
prefix if needed.  Code that constructs the value must be responsible
for that because it is the only place that knows.
2019-02-18 17:09:26 -05:00
Yves Frederix
bee6597ac5 FindBoost: Find boost libraries built with --layout=tagged
Pick up libraries of the form `boost_system-mt-x64`, which do not have
the version suffix.

Fixes: #18908
2019-02-18 10:53:42 -05:00
Brad King
75b45956e0 Merge branch 'release-3.14' 2019-02-18 10:22:55 -05:00
Brad King
566652b0c8 Merge topic 'file_symlink_docs'
0f5a9f7934 Help: Clarify and improve readability of link-related file subcommands

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2974
2019-02-18 10:22:35 -05:00
Brad King
926a97e975 Merge branch 'file_symlink_docs' into release-3.14
Merge-request: !2974
2019-02-18 09:22:13 -05:00
Brad King
0923246b2e Merge topic 'require-xcode-5'
afb325018e Xcode: Require at least Xcode 5

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2975
2019-02-18 09:20:16 -05:00
Brad King
bafd0ffa98 Merge branch 'release-3.14' 2019-02-18 09:11:21 -05:00
Brad King
0f2eb9ac6f Merge topic 'get_filename_component_docs'
2cc145928c Help: Remove outdated statement about get_filename_component()

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2973
2019-02-18 09:09:55 -05:00
Brad King
786edf9ab4 Merge topic 'externalproject_docs'
f2072a6554 Help: Clarify ExternalProject_Add()'s LOG_MERGED_STDOUTERR behavior
f2820bce15 Release notes: Make ExternalProject dot points consistent

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2978
2019-02-18 09:09:02 -05:00
Brad King
1f8ed41419 Merge branch 'externalproject_docs' into release-3.14
Merge-request: !2978
2019-02-18 09:08:05 -05:00
Brad King
36323162cb Merge branch 'get_filename_component_docs' into release-3.14
Merge-request: !2973
2019-02-18 09:06:57 -05:00
Brad King
03e10384ec Merge topic 'delete_copy_assign'
ae5e97a005 Delete some default constructors and assignment operators

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2968
2019-02-18 09:05:30 -05:00
Brad King
d2489f2fde Merge topic 'autogen_test_fix'
91344e7a46 Autogen: Fix RerunMocPlugin test for Ninja generator

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2971
2019-02-18 09:04:47 -05:00
Kitware Robot
f1235fd37d CMake Nightly Date Stamp 2019-02-18 00:01:19 -05:00
Kitware Robot
8ec1942f62 CMake Nightly Date Stamp 2019-02-17 00:01:05 -05:00
Craig Scott
f2072a6554 Help: Clarify ExternalProject_Add()'s LOG_MERGED_STDOUTERR behavior
The output is only merged for a step if it is logging to file. This
option is ignored for steps that are logging normally.

A minor grammatical error has also been fixed as part of this change.
2019-02-17 13:30:07 +11:00
Craig Scott
f2820bce15 Release notes: Make ExternalProject dot points consistent
Use same phrasing and command linking.
2019-02-17 13:17:56 +11:00
Gregor Jasny
afb325018e Xcode: Require at least Xcode 5 2019-02-16 15:20:39 +01:00
Craig Scott
0f5a9f7934 Help: Clarify and improve readability of link-related file subcommands 2019-02-16 20:55:49 +11:00
Kitware Robot
657b30905a CMake Nightly Date Stamp 2019-02-16 00:01:07 -05:00
Craig Scott
2cc145928c Help: Remove outdated statement about get_filename_component()
After !2853, the statement that the "longest file extension is
always considered" is no longer true. Both NAME_WLE and
LAST_EXT now return details based on the shortest file
extension.

Fixes: 7a25ef326b (Help: Add documentation for new get_filename_component components, 2019-01-24, 3.14.0-rc1)
2019-02-16 15:26:23 +11:00
Artur Ryt
706b93fa55 Modernize: C-arrays and loops over them
It replaces C arrays with deduced std::initializer_lists
or std::array what makes enables for-loop over them.
2019-02-15 23:40:30 +01:00
Brad King
820424d95d Merge topic 'systools-cleanup'
bd20cc29a2 cmSystemTools: Remove redundant cmCopyFile() and Split()

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2966
2019-02-15 10:04:49 -05:00
Kyle Edwards
160735c479 Merge topic 'remove_return_void'
30faf72625 Remove return from void function

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2969
2019-02-15 10:02:10 -05:00
Brad King
f2dc10d55c Merge topic 'ninja-swift-library-name'
157570b5a2 Add placeholder for Swift's library name

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2902
2019-02-15 10:00:21 -05:00
Brad King
3c9c91a360 Merge topic 'update-kwsys'
f510aafbfc Merge branch 'upstream-KWSys' into update-kwsys
a930de85d8 KWSys 2019-02-14 (e270ce9f)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2967
2019-02-15 09:59:40 -05:00
Vitaly Stakhovsky
bd20cc29a2 cmSystemTools: Remove redundant cmCopyFile() and Split() 2019-02-15 09:52:29 -05:00
Brad King
442cb77bf3 Merge branch 'release-3.14' 2019-02-15 09:21:20 -05:00
Brad King
6646623993 Merge topic 'tests-intel-fixup'
8fc0c98f08 Tests: Fix Module.WriteCompilerDetectionHeader for Intel on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2963
2019-02-15 07:58:57 -05:00
Brad King
e6897c72e7 CMake 3.14.0-rc2 v3.14.0-rc2 2019-02-15 07:46:43 -05:00