summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'ninja-swift-partial'Brad King2019-02-203-0/+26
|\ | | | | | | | | | | | | c048cb75fc Ninja: add properties for Swift partial module and doc Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2985
| * Ninja: add properties for Swift partial module and docSaleem Abdulrasool2019-02-183-0/+26
| | | | | | | | | | | | | | | | | | | | | | When building a swift object, we emit a partial swiftmodule and swiftdoc that must be merged at the end. However, in order to do that, we need to enumerate the swiftmodules and swiftdocs. As a result, the path must be known to CMake. Rather than hardcoding the rules into CMake, create a source property that we can query. This will allow us to create a final placeholder to emit the merge rule. Issue: #18800
* | Merge topic 'once-is-enough'Brad King2019-02-201-12/+10
|\ \ | | | | | | | | | | | | | | | | | | c489c3e715 Ninja: remove duplicate local variable (NFC) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2986
| * | Ninja: remove duplicate local variable (NFC)Saleem Abdulrasool2019-02-181-12/+10
| |/ | | | | | | Remove the second reference to the generator target.
* | Merge branch 'release-3.14'Brad King2019-02-200-0/+0
|\ \
| * \ Merge branch 'autogen_cache_binary_checks' into release-3.14Brad King2019-02-194-39/+88
| |\ \ | | | | | | | | | | | | Merge-request: !2990
| * \ \ Merge branch 'vs-win-sdk' into release-3.14Brad King2019-02-193-3/+19
| |\ \ \ | | | | | | | | | | | | | | | Merge-request: !2989
| * \ \ \ Merge branch 'asm-no-slash-question' into release-3.14Brad King2019-02-193-3/+3
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !2984
* | \ \ \ \ Merge topic 'autogen_cache_binary_checks'Brad King2019-02-204-39/+88
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b5befac154 Autogen: Use output caching GetExecutableTestOutput a4e01d6707 Autogen: Add output caching GetExecutableTestOutput Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2990
| * | | | | Autogen: Use output caching GetExecutableTestOutputSebastian Holtermann2019-02-192-39/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the output caching cmQtAutoGenGlobalInitializer::GetExecutableTestOutput method to avoid identical calls to moc, uic and rcc. Closes #18947
| * | | | | Autogen: Add output caching GetExecutableTestOutputSebastian Holtermann2019-02-192-0/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds the cmQtAutoGenGlobalInitializer::GetExecutableTestOutput method which caches the output of the called executable and returns the cached value on any subsequent call.
* | | | | | Merge topic 'vs-win-sdk'Brad King2019-02-203-3/+19
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | VS: Tell VS 2019 to use Windows SDK 8.1 explicitly when neededBrad King2019-02-191-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | VS: Factor out a method to set the Windows SDK version internallyBrad King2019-02-192-3/+13
| |/ / / /
* | | | | Merge topic 'asm-no-slash-question'Brad King2019-02-203-3/+3
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | b186329d3d Use -? instead of /? to test compiler for MSVC-like command-line support Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2984
| * | | | Use -? instead of /? to test compiler for MSVC-like command-line supportBrad King2019-02-193-3/+3
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | CMake Nightly Date StampKitware Robot2019-02-201-1/+1
| | | |
* | | | Merge branch 'release-3.14'Brad King2019-02-190-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'fix-legacy-implicit-includes' into release-3.14Brad King2019-02-193-37/+44
| |\ \ \ | | | | | | | | | | | | | | | Merge-request: !2981
| * \ \ \ Merge branch 'FindBoost-layout-tagged' into release-3.14Brad King2019-02-191-0/+8
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !2961
* | \ \ \ \ Merge topic 'modernize-for-loops-c-arrays'Brad King2019-02-196-76/+80
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 706b93fa55 Modernize: C-arrays and loops over them Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2951
| * | | | | | Modernize: C-arrays and loops over themArtur Ryt2019-02-156-76/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It replaces C arrays with deduced std::initializer_lists or std::array what makes enables for-loop over them.
* | | | | | | Merge topic 'readme-msys2'Craig Scott2019-02-191-3/+16
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | README: Explain how to bootstrap via MSYS2 on WindowsBrad King2019-02-191-3/+16
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | Inspired-by: Bartosz Kosiorek <bartosz.kosiorek@tomtom.com>
* | | | | | | Merge topic 'fix-legacy-implicit-includes'Brad King2019-02-193-37/+44
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | Do not explicitly report "standard" include directories as implicitBrad King2019-02-182-20/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | Restore unconditional use of "standard" include directoriesBrad King2019-02-181-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `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
| * | | | | | Prefix implicit include directories with sysroot on constructionBrad King2019-02-182-15/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | Merge topic 'FindBoost-layout-tagged'Brad King2019-02-191-0/+8
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bee6597ac5 FindBoost: Find boost libraries built with --layout=tagged Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2961
| * | | | | | FindBoost: Find boost libraries built with --layout=taggedYves Frederix2019-02-181-0/+8
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pick up libraries of the form `boost_system-mt-x64`, which do not have the version suffix. Fixes: #18908
* | | | | | CMake Nightly Date StampKitware Robot2019-02-191-1/+1
| |_|/ / / |/| | | |
* | | | | Merge branch 'release-3.14'Brad King2019-02-180-0/+0
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge branch 'file_symlink_docs' into release-3.14Brad King2019-02-181-23/+23
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !2974
* | \ \ \ \ Merge topic 'file_symlink_docs'Brad King2019-02-181-23/+23
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 0f5a9f7934 Help: Clarify and improve readability of link-related file subcommands Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2974
| * | | | | Help: Clarify and improve readability of link-related file subcommandsCraig Scott2019-02-161-23/+23
| | |/ / / | |/| | |
* | | | | Merge topic 'require-xcode-5'Brad King2019-02-188-165/+19
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | afb325018e Xcode: Require at least Xcode 5 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2975
| * | | | | Xcode: Require at least Xcode 5Gregor Jasny2019-02-168-165/+19
| | | | | |
* | | | | | Merge branch 'release-3.14'Brad King2019-02-180-0/+0
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge branch 'externalproject_docs' into release-3.14Brad King2019-02-182-2/+3
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !2978
| * \ \ \ \ \ Merge branch 'get_filename_component_docs' into release-3.14Brad King2019-02-181-4/+3
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | Merge-request: !2973
* | | | | | | Merge topic 'get_filename_component_docs'Brad King2019-02-181-4/+3
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2cc145928c Help: Remove outdated statement about get_filename_component() Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2973
| * | | | | | Help: Remove outdated statement about get_filename_component()Craig Scott2019-02-161-4/+3
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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)
* | | | | | Merge topic 'externalproject_docs'Brad King2019-02-182-2/+3
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | Help: Clarify ExternalProject_Add()'s LOG_MERGED_STDOUTERR behaviorCraig Scott2019-02-171-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | Release notes: Make ExternalProject dot points consistentCraig Scott2019-02-171-1/+1
| |/ / / / | | | | | | | | | | Use same phrasing and command linking.
* | | | | Merge topic 'delete_copy_assign'Brad King2019-02-1835-1/+126
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ae5e97a005 Delete some default constructors and assignment operators Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2968
| * | | | | Delete some default constructors and assignment operatorsAlbert Astals Cid2019-02-1535-1/+126
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They are unused, but if someone used them they would lead to problems since they would copy the internal raw pointers and the destructor would cause double delete
* | | | | | Merge topic 'autogen_test_fix'Brad King2019-02-181-11/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 91344e7a46 Autogen: Fix RerunMocPlugin test for Ninja generator Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2971
| * | | | | | Autogen: Fix RerunMocPlugin test for Ninja generatorSebastian Holtermann2019-02-151-11/+4
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2019-02-181-1/+1
| | | | | | |
generated by cgit v0.12 at 2025-02-02 20:06:20 (GMT)