summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | | | Merge branch 'file-GENERATE-earlier' into release-3.16Brad King2019-10-094-15/+11
|\ \ \ \ | | |/ / | |/| | | | | | Merge-request: !3895
| * | | file(GENERATE): Create output file structures even earlierBrad King2019-10-074-15/+11
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit b80557c7bd (file(GENERATE): Evaluate early to allow generating source files, 2014-11-04, v3.2.0-rc1~398^2) we create the `cmSourceFile` instances marked with a `GENERATED` source file property before tracing source dependencies. Move it to even earlier so that steps in `cmGlobalGenerator::AddAutomaticSources` can operate on all sources. This also avoids the accidental `O(n^2)` calls for `n` local generators that we had previously. This is also needed since commit 83c1657ff7 (Unity build: Generate sources during Compute step, 2019-10-03) to support `file(GENERATE)` outputs as sources in a target with `UNITY_BUILD` enabled.
* | | Begin 3.16 release versioningBrad King2019-10-071-3/+3
|/ /
* | Merge topic 'export-genex-under-prefix'Brad King2019-10-071-3/+3
|\ \ | | | | | | | | | | | | | | | | | | 3ded5b6da8 install,export: Fix export of a genex following $<INSTALL_PREFIX> Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3886
| * | install,export: Fix export of a genex following $<INSTALL_PREFIX>Brad King2019-10-041-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | The relative path check added by commit 5838aba1aa (Export: Report error on relative include with genex., 2013-11-26, v3.0.0-rc1~285^2) was added one condition too early. If the value starts in `${_IMPORT_PREFIX}` (which comes from `$<INSTALL_PREFIX>`) then it is an absolute path. Fixes: #19791
* | | CMake Nightly Date StampKitware Robot2019-10-071-1/+1
| | |
* | | CMake Nightly Date StampKitware Robot2019-10-061-1/+1
| | |
* | | CMake Nightly Date StampKitware Robot2019-10-051-1/+1
| | |
* | | Merge topic 'unity-step'Brad King2019-10-0411-10/+28
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 83c1657ff7 Unity build: Generate sources during Compute step Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3884
| * | | Unity build: Generate sources during Compute stepBrad King2019-10-0311-10/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The unity build sources need to be added for all generators. Create them during `cmGlobalGenerator::Compute` to avoid duplicating the calls in every generator. We already handle Qt autogen there too. Issue: #19789
* | | | Merge topic 'pch-multi-language'Brad King2019-10-041-143/+158
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | 38c1f2ab22 PCH: Fix CMake test files indentation 1144a4fa47 PCH: Add multi-language PCH generation support Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3885
| * | | PCH: Add multi-language PCH generation supportCristian Adam2019-10-031-143/+158
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the target has C files, it will get a C PCH file. The same for C++ files. The linker language is no longer used to determine which language to use for PCH. Fixes: #19790
* | | | CMake Nightly Date StampKitware Robot2019-10-041-1/+1
|/ / /
* | | Merge topic 'ctest-hardware-allocation'Brad King2019-10-0323-7/+3988
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e9500271a3 Help: Add documentation for CTest hardware allocation d1f100a415 CTest: Add Json output for PROCESSES property b741ee820d Tests: Add test for CTest hardware allocation feature 3c8a5aad46 Tests: Write tests for cthwalloc helper tool 2d74e54661 Tests: Write cthwalloc helper tool e34de0691b CTest: Allocate hardware to tests aee0964851 CTest: Add bin-packing algorithm c494b2973a CTest: Add cmCTestHardwareAllocator class ... Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3858
| * | CTest: Add Json output for PROCESSES propertyKyle Edwards2019-10-021-0/+26
| | |
| * | CTest: Allocate hardware to testsKyle Edwards2019-10-0210-7/+262
| | |
| * | CTest: Add bin-packing algorithmKyle Edwards2019-10-023-0/+233
| | | | | | | | | | | | | | | | | | | | | This algorithm is used to determine whether or not a test can execute with the available resources. It uses a recursive largest- first algorithm to try to place the tests into their respective slots.
| * | CTest: Add cmCTestHardwareAllocator classKyle Edwards2019-10-023-0/+126
| | |
| * | CTest: Add parser for hardware spec fileKyle Edwards2019-10-023-0/+174
| | |
| * | CTest: Add lexer for PROCESSES propertyKyle Edwards2019-10-029-0/+3167
| | |
* | | Merge topic 'xcode-scheme-custom-target'Brad King2019-10-031-1/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 333a2ff099 Merge branch 'backport-xcode-scheme-custom-target' 7cccc5b199 Xcode: Restore CMAKE_XCODE_GENERATE_SCHEME for custom targets ac9934406d Xcode: Restore CMAKE_XCODE_GENERATE_SCHEME for custom targets Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3878
| * | | Xcode: Restore CMAKE_XCODE_GENERATE_SCHEME for custom targetsBrad King2019-10-021-1/+6
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | The target property introduced by commit 413b71485a (Xcode: Create Xcode schemes per target, 2019-03-11, v3.15.0-rc1~347^2) was accidentally not initialized by `CMAKE_XCODE_GENERATE_SCHEME` for custom targets. Fix it and update the test. Fixes: #19759
* | | CMake Nightly Date StampKitware Robot2019-10-031-1/+1
|/ /
* | Merge topic 'ninja-depend-shared-symlinks'Brad King2019-10-021-0/+21
|\ \ | | | | | | | | | | | | | | | | | | 4891f0f966 Ninja: Ensure shared library version symlinks are created for dependents Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3875
| * | Ninja: Ensure shared library version symlinks are created for dependentsBrad King2019-10-011-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | When linking to a shared library target that has version symlinks, add an order-only dependency on the build statement that creates the links. This ensures that the links exist for use at runtime. Fixes: #19774
* | | Merge topic 'clang-format-normalize-headers-presentation'Brad King2019-10-02432-1503/+1715
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ed98209ddc Revise include order using clang-format-6.0 185fe49f29 clang-format: Normalize headers presentation 42ef28b4f3 Remove unused uid_t/gid_t types on Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Sebastian Holtermann <sebholt@web.de> Merge-request: !3851
| * | | Revise include order using clang-format-6.0Kitware Robot2019-10-01431-1498/+1715
| | | | | | | | | | | | | | | | | | | | Run the `clang-format.bash` script to update our C and C++ code to a new include order `.clang-format`. Use `clang-format` version 6.0.
| * | | Remove unused uid_t/gid_t types on WindowsBrad King2019-10-011-5/+0
| |/ / | | | | | | | | | | | | | | | | | | These were added and used by commit 5299141320 (CPackDeb: Enable the DEB generator on Windows, 2017-06-17, v3.10.0-rc1~445^2) but have not been used since commit df556e65f2 (cmCPackDebGenerator: Use libarchive to create .deb file, 2017-08-24, v3.10.0-rc1~220^2).
* | | Merge topic 'xcode-debug-document-versioning'Brad King2019-10-023-2/+27
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 67200c37b0 xcode: Add XCODE_SCHEME_DEBUG_DOCUMENT_VERSIONING property Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3876
| * | | xcode: Add XCODE_SCHEME_DEBUG_DOCUMENT_VERSIONING propertyGregor Jasny2019-10-013-2/+27
| | | |
* | | | Merge topic 'pch-compile-pdb'Brad King2019-10-022-0/+41
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e6e189e02b PCH: Report error when setting COMPILE_PDB_NAME property Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3864
| * | | | PCH: Report error when setting COMPILE_PDB_NAME propertyCristian Adam2019-10-012-0/+41
| | | | | | | | | | | | | | | | | | | | | | | | | Reusable precompile headers require specific COMPILE_PDB_NAME property values. Report error if the user tries to set a different value.
* | | | | Merge topic 'vs-v142-version'Brad King2019-10-021-1/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5117389931 VS: Fix support for v142 toolset minor versions Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3874
| * | | | | VS: Fix support for v142 toolset minor versionsBrad King2019-10-011-1/+3
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using `-T v142,version=14.22` the `.props` file location is different starting with version `14.20` than it was in `14.16` and below. Adapt the path based on the version. Fixes: #19779
| * | | | CMake 3.15.4v3.15.4Brad King2019-09-301-1/+1
| | | | |
| * | | | Merge branch 'backport-3.15-fix-EXCLUDE_FROM_ALL-subdir-all' into release-3.15Brad King2019-09-308-21/+48
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !3863
generated by cgit v0.12 at 2024-12-26 18:04:35 (GMT)