summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'ctest-resource-groups' into release-3.16Kyle Edwards2019-11-0724-513/+519
|\ | | | | | | | | | | | | | | | | | | | | | | | | c1435d9812 Help: Fix error in resource allocation example eb9d945f14 CTest: Rename hardware -> resources for RunCMake tests c544cb6698 CTest: Rename hardware -> resources for source code 6ce27d3a2e cmCTestMultiProcessHandler: Rename resource locking functions a7c1e15cc4 CTest: Rename hardware -> resources for CMake variables, command options 73a40b19ff CTest: Rename "Processes" lexer to "ResourceGroups" af9ed543b0 CTest: Rename PROCESSES test property to RESOURCE_GROUPS Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3994
| * CTest: Rename hardware -> resources for source codeCraig Scott2019-11-0515-182/+187
| |
| * cmCTestMultiProcessHandler: Rename resource locking functionsCraig Scott2019-11-052-6/+6
| | | | | | | | | | | | Renaming these ahead of other refactoring which will use the previous names. The previous names more accurately reflect their purpose after this commit anyway (talking about locking and unlocking rather than allocating and deallocating).
| * CTest: Rename hardware -> resources for CMake variables, command optionsCraig Scott2019-11-055-9/+9
| | | | | | | | | | | | Only changes the user-visible effects of renaming hardware allocation to resource allocation. Code changes are the minimum needed to achieve that.
| * CTest: Rename "Processes" lexer to "ResourceGroups"Brad King2019-11-059-298/+298
| | | | | | | | | | The corresponding test property `PROCESSES` has been renamed to `RESOURCE_GROUPS`.
| * CTest: Rename PROCESSES test property to RESOURCE_GROUPSBrad King2019-11-054-23/+24
| | | | | | | | | | | | | | | | | | | | | | | | The `PROCESSES` test property name added for CMake 3.16 is too close to the existing `PROCESSORS` test property. Furthermore, the property in principle specifies groups of resources organized in a way that is meaningful to a particular test. The groups may often correspond to processes but they could have other meanings. Since the property name `PROCESSES` has not been in a final 3.16 release yet, simply rename it to `RESOURCE_GROUPS`. Fixes: #19914
* | Merge topic 'unity-include-generated' into release-3.16Brad King2019-11-071-1/+0
|\ \ | | | | | | | | | | | | | | | | | | | | | 7ddf462304 Unity build: Include GENERATED files into unity build Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Julien Schueller <schueller@phimeca.com> Merge-request: !4001
| * | Unity build: Include GENERATED files into unity buildCristian Adam2019-11-061-1/+0
| | | | | | | | | | | | | | | | | | | | | There is no reason to skip the generated files, in case of problems one can use the SKIP_UNITY_BUILD_INCLUSION property. Fixes: #19925
* | | Merge topic 'llvm-rc-fix' into release-3.16Brad King2019-11-071-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | f0c00bec1d CMakeVersion.rc: Fix build with llvm-rc Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4003
| * | | CMakeVersion.rc: Fix build with llvm-rcCristian Adam2019-11-061-1/+1
| |/ / | | | | | | | | | llvm-rc expects versioning as having four items, it fails otherwise.
* | | Merge topic 'xcode-restore-CMakeLists' into release-3.16Brad King2019-11-061-10/+14
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | 0ce8a5c08d Xcode: Fix generated references to CMakeLists.txt files 9457c95aa0 cmGlobalXCodeGenerator: Mark known source locations Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3999
| * | Xcode: Fix generated references to CMakeLists.txt filesBrad King2019-11-051-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | Refactoring in commit 2d888e3390 (cmSourceFile: Rename mutating GetFullPath() overload, 2019-08-29, v3.16.0-rc1~160^2) accidentally left the paths to `CMakeLists.txt` files empty in generated Xcode project files. Fixes: #19927
| * | cmGlobalXCodeGenerator: Mark known source locationsBrad King2019-11-051-4/+8
| |/
* | Merge branch 'source_group-tree' into release-3.16Brad King2019-11-051-3/+11
|\ \ | | | | | | | | | Merge-request: !3979
| * | source_group: ensure that passed file is not a directoryMateusz Janek2019-11-041-3/+11
| |/ | | | | | | Fixes: #19769
* | Merge branch 'objc-pch' into release-3.16Brad King2019-11-052-7/+29
|\ \ | | | | | | | | | Merge-request: !3983
| * | PCH: Add support for OBJC/OBJCXX languagesCristian Adam2019-11-032-7/+29
| |/
* | Merge branch 'docs-INSTALL_REMOVE_ENVIRONMENT_PATH' into release-3.16Brad King2019-11-051-1/+1
|\ \ | | | | | | | | | Merge-request: !3985
| * | RPATH: Remove stray indent in generated file(RPATH_CHANGE) commandCraig Scott2019-11-041-1/+1
| |/
* | Merge branch 'add_CMAKE_FIND_PACKAGE_NO_SYSTEM_PACKAGE_REGISTRY' into ↵Craig Scott2019-11-051-1/+7
|\ \ | | | | | | | | | | | | release-3.16 Merge-request: !3968
| * | find_package: Add support for CMAKE_FIND_USE_SYSTEM_PACKAGE_REGISTRYRobert Maynard2019-11-041-1/+7
| |/ | | | | | | | | | | | | | | Extend the change from commit 1d00ba9ccf (Find: find_package prefers variable CMAKE_FIND_USE_REGISTRY, 2018-11-13, v3.16.0-rc1~461^2~1) to cover the system package registry too. Fixes: #19890
* | ForceToRelativePath: Fix spurious assertion when local path is root dirCraig Scott2019-11-021-2/+7
|/ | | Fixes: #19909
* CMake 3.16.0-rc3v3.16.0-rc3Brad King2019-10-311-1/+1
|
* Merge branch 'autogen_windows_search_fix' into release-3.16Brad King2019-10-311-5/+3
|\ | | | | | | Merge-request: !3962
| * Autogen: Fix ambiguity in header file detection on WindowsSebastian Holtermann2019-10-301-5/+3
| | | | | | | | | | | | | | | | | | On Windows, `CollapseFullPath` called with a path that ends with a dot might return a file with the same base name but any extension. To make sure we get only the file with the requested header extension, pass the complete file name to `CollapseFullPath`. Fixes: #19892
* | Merge branch 'project-version-buffer-overflow' into release-3.16Craig Scott2019-10-281-1/+2
|\ \ | | | | | | Merge-request: !3948
| * | project: Fix potential buffer write-past-end for version componentsCraig Scott2019-10-261-1/+2
| |/ | | | | | | This fixes two errors: not accounting for the trailing null and a misunderstanding of what std::numeric_limits::digits10 means.
* | ccmake: Fully clear the 1st help line when processingSylvain Joubert2019-10-201-1/+1
|/
* CMake 3.16.0-rc2v3.16.0-rc2Brad King2019-10-181-1/+1
|
* Merge branch 'pch-makefile-depends' into release-3.16Brad King2019-10-172-23/+9
|\ | | | | | | Merge-request: !3928
| * PCH: Fix Makefile dependencies to rebuild PCH on header changesBrad King2019-10-171-1/+5
| | | | | | | | | | | | | | | | Teach the Makefile generator to scan the implicit dependencies of PCH creation. When a header named by `target_precompile_headers` changes the corresponding PCH must be rebuilt and all consumers recompiled. Fixes: #19830
| * cmMakefileTargetGenerator: Inline WriteObjectBuildFile in only call siteBrad King2019-10-162-22/+4
| |
* | Merge branch 'export-target-lang-name' into release-3.16Brad King2019-10-172-14/+25
|\ \ | | | | | | | | | Merge-request: !3927
| * | install,export: Do not treat language names as target namesBrad King2019-10-162-14/+25
| |/ | | | | | | | | | | | | When generating `IMPORTED_LINK_INTERFACE_LANGUAGES`, do not treat the entries as target names. Fixes: #19846
* | Merge branch 'swift-cross-compile' into release-3.16Brad King2019-10-151-0/+3
|\ \ | | | | | | | | | Merge-request: !3921
| * | try_compile: support Swift for cross-compilationSaleem Abdulrasool2019-10-151-0/+3
| |/ | | | | | | | | Ensure that we preserve the `CMAKE_Swift_COMPILER_TARGET` variable to use cross-compilation for testing the Swift compiler if appropriate.
* | Merge branch 'cmake-initial-cache-relative' into release-3.16Brad King2019-10-141-0/+2
|\ \ | | | | | | | | | Merge-request: !3912
| * | cmake: Fix relative path regression in -CPeter Waller2019-10-141-0/+2
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 4ca0526f8a (cmake: Pass -S and -B into PreLoad.cmake and -C scripts, 2019-08-20, v3.16.0-rc1~195^2) the value of `CMAKE_SOURCE_DIR` is the source directory rather than the current working directory. This was correct on its own, but the place storing that value is also used as the base for relative paths specified on the command line. The latter should of course be relative to the current working directory. The fix is to switch to use a full path internally, unless a full path is already specified. Add tests for the behaviour of `-C` under these four circumstances: {with -S, without -S} x {full path, relative path} Fixes: #19827
* | Merge branch 'no-git-version' into release-3.16Brad King2019-10-111-44/+46
|\ \ | | | | | | | | | Merge-request: !3910
| * | CMakeVersion: Add option to disable Git suffixKyle Edwards2019-10-111-43/+45
| | | | | | | | | | | | | | | | | | | | | Distro maintainers who are building from Git with patches added on may want to disable the automatic Git suffixing, as it does not provide any useful information and simply confuses the end user. Add an undocumented CMake_VERSION_NO_GIT variable to disable this.
| * | CMakeVersion: Prefer Git information provided by 'git archive' exportsBrad King2019-10-111-11/+11
| |/ | | | | | | | | | | | | | | Update the approach from commit fe2c558ba6 (CMakeVersion: Preserve Git information during 'git archive', 2019-07-25, v3.16.0-rc1~337^2) to prefer `export-subst` information. This will allow exported source trees to be imported into unrelated Git repositories while still using the original upstream CMake commit information.
* | Merge branch 'vs-v142-csharp-flags' into release-3.16Brad King2019-10-111-2/+1
|\ \ | |/ |/| | | Merge-request: !3908
| * VS: Add toolset v142 CSharp flag tableBrad King2019-10-111-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | While the flag tables for C and C++ were generated from MSBuild `.xml` files, the CSharp flag tables were written by hand. Copy the `v141` flag table to use for the `v142` toolset. Remove the special case added by commit 626c51f47b (VS: Update for Visual Studio 2019 Preview 2, 2019-01-24, v3.14.0-rc1~74^2) that mapped the v142 flag table lookup to v141 since we now have the real v142 table. Fixes: #19828
* | CMake 3.16.0-rc1v3.16.0-rc1Brad King2019-10-101-1/+1
| |
* | Merge branch 'rename_loglevel_option' into release-3.16Brad King2019-10-102-2/+14
|\ \ | | | | | | | | | Merge-request: !3899
| * | CLI: Rename --loglevel to --log-level for naming consistencyCraig Scott2019-10-102-2/+14
| | | | | | | | | | | | | | | | | | | | | Other multi-word command line options use hyphens to separate the words, so the --loglevel option introduced in CMake 3.15 was inconsistent in this regard. Rename it to --log-level but still support the original --loglevel name to preserve backward compatibility.
* | | Merge branch 'pch-generate' into release-3.16Brad King2019-10-1015-89/+255
|\ \ \ | | | | | | | | | | | | Merge-request: !3890
| * | | PCH: Generate sources during Compute stepCristian Adam2019-10-0915-89/+255
| | | |
* | | | Merge branch 'vs-16.4-global-targets' into release-3.16Brad King2019-10-091-0/+4
|\ \ \ \ | | | | | | | | | | | | | | | Merge-request: !3896
| * | | | VS: Tell VS 16.4 not to verify CMake-provided custom command outputsBrad King2019-10-071-0/+4
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend the fix from commit 0578239d3a (VS: Tell VS 16.4 not to verify SYMBOLIC custom command outputs, 2019-09-23, v3.15.4~2^2) to apply to outputs in CMake-provided targets like `install`. Simply mark these outputs as `SYMBOLIC` too since they are not actually generated. Fixes: #19737