summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'fetchcontent-reduce-boilerplate'Brad King2019-01-3013-74/+275
|\ | | | | | | | | | | | | | | | | a94355c7b7 FetchContent: Add new command FetchContent_MakeAvailable() 611d5274de Sphinx: Add limited support for nested variables in docs 1a07e1b47d FetchContent: Trivial doc corrections Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2830
| * FetchContent: Add new command FetchContent_MakeAvailable()Craig Scott2019-01-2612-68/+266
| | | | | | Relates: #18754
| * Sphinx: Add limited support for nested variables in docsCraig Scott2019-01-261-1/+4
| | | | | | | | This is needed to allow example code to contain content like `${some_${foo}_bar}`.
| * FetchContent: Trivial doc correctionsCraig Scott2019-01-201-6/+6
| |
* | Merge topic 'vs-msbuild-arch'Brad King2019-01-302-5/+17
|\ \ | | | | | | | | | | | | | | | | | | | | | da402a081b VS: Use MSBuild matching toolset host architecture 147d36ce93 Find native build tool after selecting a toolset Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2876
| * | VS: Use MSBuild matching toolset host architectureBrad King2019-01-291-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | VS 2017 and VS 2019 provide `amd64/MSBuild.exe` variants next to their `MSBuild.exe` tools. When the 64-bit host toolchain is selected (e.g. via `host=x64`), select the 64-bit MSBuild too. Fixes: #18219
| * | Find native build tool after selecting a toolsetBrad King2019-01-291-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | This will allow `CMAKE_GENERATOR_TOOLSET` to influence build tool selection. For reference, commit f8cb9944a1 (Find native build tool after determining the target system, 2017-09-26, v3.10.0-rc1~31^2) already delayed this step from where it was historically.
* | | Merge topic 'vendor-docs'Brad King2019-01-301-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | f201c9257d DOCS: put Flang in alphabetical order Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2879
| * | | DOCS: put Flang in alphabetical orderMichael Hirsch, Ph.D2019-01-291-1/+1
| | | |
* | | | Merge topic 'functional-callbacks'Brad King2019-01-3016-191/+158
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8c92db829b MessageCallback: Remove unused bool& argument bcee24aecc Use `std::function` for callbacks Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: vvs31415 <vstakhovsky@fastmail.com> Acked-by: Daniel Pfeifer <daniel@pfeifer-mail.de> Merge-request: !2872
| * | | | MessageCallback: Remove unused bool& argumentRegina Pfeifer2019-01-299-28/+23
| | | | |
| * | | | Use `std::function` for callbacksRegina Pfeifer2019-01-2916-187/+159
| |/ / /
* | | | Merge topic 'copyfile-stdstring'Brad King2019-01-3011-33/+18
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c31b6e616d cmSystemTools: copy file member functions accept std::string params Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2877
| * | | | cmSystemTools: copy file member functions accept std::string paramsVitaly Stakhovsky2019-01-2911-33/+18
| |/ / / | | | | | | | | | | | | | | | | Cleaned up `c_str()`s. `cmSystemTools::CopyFileIfDifferent()` removed as redundant.
* | | | Merge topic 'UseJava-if-cleanup'Brad King2019-01-301-147/+147
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 95ef818c7d UseJava: clean-up if() expressions Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2871
| * | | | UseJava: clean-up if() expressionsMarc Chevrier2019-01-281-147/+147
| | | | | | | | | | | | | | | | | | | | Fixes: #18836
* | | | | Merge branch 'release-3.13'Brad King2019-01-300-0/+0
|\ \ \ \ \
| * \ \ \ \ Merge branch 'add-missing-macos-framework' into release-3.13Brad King2019-01-291-1/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !2873
* | | | | | | CMake Nightly Date StampKitware Robot2019-01-301-1/+1
| | | | | | |
* | | | | | | Merge topic 'tidy-use-equals-default'Brad King2019-01-29154-529/+205
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 094f01d0f0 cleanup: Prefer compiler provided special member functions 55671b41d2 clang-tidy: Use `= default` Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Brad King <brad.king@kitware.com> Merge-request: !2841
| * | | | | | cleanup: Prefer compiler provided special member functionsRegina Pfeifer2019-01-2538-113/+11
| | | | | | |
| * | | | | | clang-tidy: Use `= default`Regina Pfeifer2019-01-25151-463/+241
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Suppress some cases in `Source/cmGeneratorExpressionNode.cxx` and `Source/cmUVHandlePtr.h` where a few older compilers require a user-defined default constructor (with `{}`).
* | | | | | | Merge topic 'add_consistent_verbose_build_flag'Brad King2019-01-2942-135/+268
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 66801f4d40 cmake: Add tests for verbose output to --build mode 439fe2e253 cmake: Add options for verbose output to --build mode 638667efa2 cmake: cmcmd.cxx fix "The arguments are" comments 3ca4402966 ctest: Fix --build-and-test without --build-target on Xcode cb6c233ecc cmake: Add -hideShellScriptEnvironment xcodebuild option 1a45266cb5 cmGlobalGenerator: Add a class that represent the build command Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2708
| * | | | | | | cmake: Add tests for verbose output to --build modeRobert Maynard2019-01-2811-1/+50
| | | | | | | |
| * | | | | | | cmake: Add options for verbose output to --build modeFlorian Maushart2019-01-2810-7/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While we already support `VERBOSE` environment variable and `CMAKE_VERBOSE_MAKEFILE` cached variable, add `-v` and `--verbose` command line options to be able to activate verbose output directly from CMake's build tool mode command line. Also make `msbuild` honor the verbosity setting. `xcodebuild` still doesn't honor the verbosity setting as it will need a policy added and reworking of cmGlobalGenerator and cmsys to support multiple command invocation.
| * | | | | | | cmake: cmcmd.cxx fix "The arguments are" commentsFlorian Maushart2019-01-251-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed "argv" to "args" in comments to match parameter names
| * | | | | | | ctest: Fix --build-and-test without --build-target on XcodeFlorian Maushart2019-01-251-5/+7
| | | | | | | |
| * | | | | | | cmake: Add -hideShellScriptEnvironment xcodebuild optionFlorian Maushart2019-01-251-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For CMake's build tool mode add -hideShellScriptEnvironment if version is XCode 7.0 or above
| * | | | | | | cmGlobalGenerator: Add a class that represent the build commandRobert Maynard2019-01-2522-118/+143
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This refactors a std::vector<std::string> into a class so that we can extend the features to represent things such as multiple chained commands in the future.
* | | | | | | | Merge topic 'cmoutputconverter-simplify'Brad King2019-01-2925-86/+89
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b6a957c969 cmOutputConverter: move ConvertToRelativePath to cmStateDirectory. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2831
| * | | | | | | | cmOutputConverter: move ConvertToRelativePath to cmStateDirectory.Bruno Manganelli2019-01-2725-86/+89
| | | | | | | | |
* | | | | | | | | Merge topic 'message-stdstring'Brad King2019-01-2918-26/+30
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 186d9b083d cmSystemTools::Message: Add overload accepting std::string Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2869
| * | | | | | | | | cmSystemTools::Message: Add overload accepting std::stringVitaly Stakhovsky2019-01-2818-26/+30
| | | | | | | | | |
* | | | | | | | | | Merge topic 'ftc-string'Brad King2019-01-297-34/+33
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2fc69ba0b3 cmFileTimeComparison: use std::string arguments Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2868
| * | | | | | | | | | cmFileTimeComparison: use std::string argumentsVitaly Stakhovsky2019-01-287-34/+33
| |/ / / / / / / / /
* | | | | | | | | | Merge topic 'update-tutorial'Brad King2019-01-29120-680/+3346
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0e2cdacf7b Tests: Update style of c++ code snippets in Tutorial directions f2ddedfa58 Tests: Update CMake tutorial 438651506a Tests: Make ExternalProjectLocal independent of Tutorial directory Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2731
| * | | | | | | | | Tests: Update style of c++ code snippets in Tutorial directionsZack Galbreath2019-01-272-25/+17
| | | | | | | | | |
| * | | | | | | | | Tests: Update CMake tutorialBetsy McPhail2019-01-27112-604/+3099
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Latest material from data.kitware.com -> Collections -> Courses -> CMake.
| * | | | | | | | | Tests: Make ExternalProjectLocal independent of Tutorial directoryBetsy McPhail2019-01-278-76/+255
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adopt a copy of the needed content so we can modify the original independent of this test.
* | | | | | | | | | Merge topic 'vs-host-arch'Brad King2019-01-2920-26/+95
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0fd742a6ff VS: Teach VS 2019 generator to select host tools matching host arch 17cef3806d VS: Add support for explicit 32-bit toolset selection via host=x86 bf774e521b VS: Remove stray semicolons from VS 2019 implementation 142e67eac6 VS: Use internal abstraction for VCTargetsPath host arch Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2870
| * | | | | | | | | | VS: Teach VS 2019 generator to select host tools matching host archBrad King2019-01-287-5/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This generator is new so we can introduce the long-desired behavior of selecting ``host=x64`` tools by default on x64 hosts.
| * | | | | | | | | | VS: Add support for explicit 32-bit toolset selection via host=x86Brad King2019-01-2814-16/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Generalize the ``host=x64`` option in `CMAKE_GENERATOR_TOOLSET` to also support ``host=x86``.
| * | | | | | | | | | VS: Remove stray semicolons from VS 2019 implementationBrad King2019-01-281-3/+3
| | | | | | | | | | |
| * | | | | | | | | | VS: Use internal abstraction for VCTargetsPath host archBrad King2019-01-281-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Call our internal host architecture lookup method rather than directly accessing a member used by its implementation.
* | | | | | | | | | | Merge topic 'add-missing-macos-framework'Brad King2019-01-291-1/+2
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 475e78d907 macOS: Add missing explicit dependency on CoreServices framework Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2873
| * | | | | | | | | | macOS: Add missing explicit dependency on CoreServices frameworkChuck Atkins2019-01-291-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Apple, the implementation of cmGlobalXCodeGenerator::Open uses LSOpenCFURLRef from CoreServices. This get's transitively pulled in from CMake's libuv build but ends up generating a linker error when using an external libuv. This explicitly adds the appropriate dependency.
* | | | | | | | | | | Merge topic 'autogen_reenable_implicit_include_dirs'Brad King2019-01-298-79/+128
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 03dbb62d31 Autogen: Reenable passing compiler implicit include directories to moc 5f34bdc7f9 cmLocalGenerator: Refactor `GetIncludeDirectoriesImplicit` method f16dfdf71f cmLocalGenerator: Simplify `GetIncludeDirectories` Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2864
| * | | | | | | | | | | Autogen: Reenable passing compiler implicit include directories to mocSebastian Holtermann2019-01-284-8/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 5990ecb741 (Compute implicit include directories from compiler output, 2018-12-07) we now have compiler implicit include directory computation for gcc and clang. It should be safe now to pass these to `moc`. This patch re-enables passing the compiler implicit include directories to `moc`, which was disabled due to issue #18669. Fixes: #18041 Issue: #18669
| * | | | | | | | | | | cmLocalGenerator: Refactor `GetIncludeDirectoriesImplicit` methodSebastian Holtermann2019-01-281-45/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use a dedicated `std::set` for implicit include directories instead of (ab)using the emitted variable. This in combination with lambdas makes it easier to comprehend which paths are emitted. For the implicit include directories we used to omit the `CMAKE_SYSROOT_COMPILE`/`CMAKE_SYSROOT` prefix. This has been changed and the implicit paths are returned prefixed. Implicit include directory returning is only ever used by QtAutoGen which requires prefixed paths. QtAutoGen passes the (implicit) include paths to the `moc` which isn't aware of `CMAKE_SYSROOT_COMPILE`/`CMAKE_SYSROOT`.
| * | | | | | | | | | | cmLocalGenerator: Simplify `GetIncludeDirectories`Sebastian Holtermann2019-01-285-26/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch strips the `stripImplicitDirs` and `appendAllImplicitDirs` parameters from the `cmLocalGenerator::GetIncludeDirectories` method and makes it a wrapper into the new `cmLocalGenerator::GetIncludeDirectoriesImplicit` method. `cmLocalGenerator::GetIncludeDirectoriesImplicit` is the renamed old implementation of `cmLocalGenerator::GetIncludeDirectories` and still accepts `stripImplicitDirs` and `appendAllImplicitDirs`. The motivation is that there's only *one* case where `cmLocalGenerator::GetIncludeDirectories` is called with the `stripImplicitDirs` parameter being `false` (QtAutoGen), but many other places where it is called using the `true` default value. QtAutoGen is modified to use `cmLocalGenerator::GetIncludeDirectoriesImplicit` directly. In two use cases of `cmLocalGenerator::GetIncludeDirectories` the manually set `true` value for `stripImplicitDirs` is removed.
generated by cgit v0.12 at 2025-01-24 12:38:30 (GMT)