summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* cmMakefile: Move enumerations into new headerDaniel Eiband2019-09-2614-73/+93
| | | | The enumerations will also be used in cmLocalGenerator.
* Merge topic 'autogen_json'Brad King2019-09-2611-950/+1139
|\ | | | | | | | | | | | | | | | | | | | | d867e05892 Autogen: Use JSON instead of CMake script for info files 881e3cfbf9 Autogen: Variable renames and cleanups fc36f4410b Autogen: Inline GetKnownQtVersions function 1f0d23546d Autogen: Return unsigned int from GetParallelCPUCount() 6a05bd3fa6 cm/algorithm: Provide function cm::clamp Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3859
| * Autogen: Use JSON instead of CMake script for info filesSebastian Holtermann2019-09-2510-861/+1051
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We used to store information for the _autogen target in a CMake script file AutogenInfo.cmake, which was imported by a temporary cmake instance in the _autogen target. This introduced the overhead of creating a temporary cmake instance and inherited the limitations of the CMake language which only supports lists. This patch introduces JSON files to pass information to AUTORCC and autogen_ targets. JSON files are more flexible for passing data, e.g. they support nested lists. The patch has the side effects that - AutogenInfo.cmake is renamed to AutogenInfo.json - AutogenOldSettings.txt is renamed to AutogenUsed.txt - RCC<qrcBaseName><checksum>Info.cmake is renamed to AutoRcc_<qrcBaseName>_<checksum>_Info.json - RCC<qrcBaseName><checksum>.lock is renamed to AutoRcc_<qrcBaseName>_<checksum>_Lock.lock - RCC<qrcBaseName><checksum>Settings.txt is renamed to AutoRcc_<qrcBaseName>_<checksum>_Used.txt
| * Autogen: Variable renames and cleanupsSebastian Holtermann2019-09-256-59/+63
| |
| * Autogen: Inline GetKnownQtVersions functionSebastian Holtermann2019-09-251-49/+45
| |
| * Autogen: Return unsigned int from GetParallelCPUCount()Sebastian Holtermann2019-09-251-6/+5
| |
* | Merge topic 'pch-export'Brad King2019-09-261-0/+3
|\ \ | | | | | | | | | | | | | | | | | | | | | c54448e185 PCH: Propagate INTERFACE_PRECOMPILE_HEADERS in install(EXPORT) Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Cristian Adam <cristian.adam@gmail.com> Merge-request: !3862
| * | PCH: Propagate INTERFACE_PRECOMPILE_HEADERS in install(EXPORT)Brad King2019-09-251-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | This was accidentally left out of commit 0467a2f91b (PCH: add PRECOMPILE_HEADERS to special properties, 2015-03-12). Also add a test case for `install(EXPORT)` and `export()` propagation of precompiled headers. Fixes: #19741
* | | Merge topic 'fix-vsmacro-access-violation'Brad King2019-09-264-19/+18
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 7847fef510 VS: Fix access violation when calling Visual Studio macro Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3853
| * | | VS: Fix access violation when calling Visual Studio macroDaniel Eiband2019-09-244-19/+18
| | | | | | | | | | | | | | | | Fixes: #19730
* | | | Merge topic 'add-custom-target-byproduct-checks'Brad King2019-09-265-34/+68
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fd3a394614 add_custom_command: Format files in error message in a single line a1cc6b4447 add_custom_target: Add output checks for custom target byproducts cbb861ade8 add_custom_command: Add tests for custom command output checks Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3850
| * | | | add_custom_command: Format files in error message in a single lineDaniel Eiband2019-09-232-4/+4
| | | | |
| * | | | add_custom_target: Add output checks for custom target byproductsDaniel Eiband2019-09-235-32/+66
| | | | | | | | | | | | | | | | | | | | | | | | | Use the output checks for byproducts of add_custom_command also for byproducts of add_custom_target.
| * | | | add_custom_command: Add tests for custom command output checksDaniel Eiband2019-09-231-2/+2
| |/ / /
* | | | Merge topic 'ctest-argument-parser'Kyle Edwards2019-09-2620-547/+289
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0aa8a2ab8b cmCTest*Command: Port to cmArgumentParser d5a6a13368 cmArgumentParser: Record parsed keywords Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3835
| * | | | cmCTest*Command: Port to cmArgumentParserRegina Pfeifer2019-09-2018-539/+270
| | | | |
| * | | | cmArgumentParser: Record parsed keywordsRegina Pfeifer2019-09-202-8/+19
| | | | |
* | | | | Merge topic 'vs-16.4-custom-commands'Brad King2019-09-252-3/+17
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | 0578239d3a VS: Tell VS 16.4 not to verify SYMBOLIC custom command outputs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3860
| * | | | VS: Tell VS 16.4 not to verify SYMBOLIC custom command outputsBrad King2019-09-242-3/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | VS 16.4 introduces an additional check on `CustomBuild` rules that warns if the outputs of the command are not created. However, CMake supports marking outputs with the `SYMBOLIC` property to indicate that they will not actually be generated. That property is used by Makefile and Ninja generators but has not been needed by the VS generators before. Teach the VS generator to disable `VerifyInputsAndOutputsExist` in custom build rules that have a symbolic output. Fixes: #19737
| * | | | CMake 3.15.3v3.15.3Brad King2019-09-041-1/+1
| | | | |
| * | | | Merge branch 'fileapi-CMP0037-OLD' into release-3.15Brad King2019-08-301-0/+6
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !3760
| * \ \ \ \ Merge branch 'backport-find-no-name' into release-3.15Brad King2019-08-281-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !3751
| * \ \ \ \ \ Merge branch 'autogen_fix_use_after_move' into release-3.15Brad King2019-08-272-3/+3
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !3745
| * \ \ \ \ \ \ Merge branch 'alpine-cpu_zero' into release-3.15Brad King2019-08-271-0/+2
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !3740
| * \ \ \ \ \ \ \ Merge branch 'cmGlobalGenerator-compilerId-lifetime' into release-3.15Brad King2019-08-271-7/+4
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !3741
| * \ \ \ \ \ \ \ \ Merge branch 'ninja_additional_clean_files_custom_target' into release-3.15Brad King2019-08-272-0/+4
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !3739
| * \ \ \ \ \ \ \ \ \ Merge branch 'ctest-json-REQUIRED_FILES' into release-3.15Brad King2019-08-221-2/+2
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !3719
* | | | | | | | | | | | CMake Nightly Date StampKitware Robot2019-09-251-1/+1
| |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
* | | | | | | | | | | Merge topic 'pch-relative-includes'Brad King2019-09-242-1/+49
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | acb9511044 Precompile headers: Treat headers as relative to current source directory Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3840
| * | | | | | | | | | | Precompile headers: Treat headers as relative to current source directoryCristian Adam2019-09-232-1/+49
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Teach `target_precompile_headers` to treat relative paths the same way as `target_sources`. Fixes: #19733
* | | | | | | | | | | Merge topic 'add-genex-evaluate-utility'Brad King2019-09-2424-274/+198
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7dcf9cb83c cmGeneratorExpression: Add cmGeneratorExpression::Evaluate utility c7c59dae82 cmCustomCommandGenerator: Replace generator expression member c12222db86 cmGeneratorExpression: Remove Evaluate overload by parameter re-ordering 1811411fec cmGeneratorExpression: Move quiet flag to cmCompiledGeneratorExpression edb0bbd18b cmGeneratorTarget: Remove unused virtual signature of TargetPropertyEntry Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3852
| * | | | | | | | | | | cmGeneratorExpression: Add cmGeneratorExpression::Evaluate utilityDaniel Eiband2019-09-2317-158/+122
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cmGeneratorExpression::Evaluate is a shortcut when only the evaluated string is needed or an instance of cmCompiledGeneratorExpression cannot be cached. Fixes: #19686
| * | | | | | | | | | | cmCustomCommandGenerator: Replace generator expression memberDaniel Eiband2019-09-222-16/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace generator expression member variable by stack variable in the constructor.
| * | | | | | | | | | | cmGeneratorExpression: Remove Evaluate overload by parameter re-orderingDaniel Eiband2019-09-226-37/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simplify by re-ordering parameters of cmCompiledGeneratorExpression::Evaluate so that frequently used parameters are before less frequently used parameters. This allows with little extra arguments to get rid of one Evaluate overload, which makes it easier to implement the cmGeneratorExpression::Evaluate utility. The latter would otherwise need four overloads.
| * | | | | | | | | | | cmGeneratorExpression: Move quiet flag to cmCompiledGeneratorExpressionDaniel Eiband2019-09-2210-60/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The quiet flag is false for all but one call to Evaluate. Make the quiet flag a setter of cmCompiledGeneratorExpression to be able to remove it from the Evaluate function signature.
| * | | | | | | | | | | cmGeneratorTarget: Remove unused virtual signature of TargetPropertyEntryDaniel Eiband2019-09-211-35/+10
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unused virtual Evaluate signature of TargetPropertyEntry. Also remove the boolean parameter quiet.
* | | | | | | | | | | Merge topic 'miscellaneous-refactorings'Brad King2019-09-244-5/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f4afcd5c6b VS: Remove call to ConvertToWindowsExtendedPath with result discarded 61fdf326d8 cmState: Avoid lowering command name twice 0965bd9c06 Generators: Remove function declarations which do not have a definition Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3847
| * | | | | | | | | | | VS: Remove call to ConvertToWindowsExtendedPath with result discardedDaniel Eiband2019-09-211-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove call to ConvertToWindowsExtendedPath. The call has no side effect and the return value is discarded.
| * | | | | | | | | | | cmState: Avoid lowering command name twiceDaniel Eiband2019-09-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The given command given to GetCommand is already lower case so we can use GetCommandByExactName directly.
| * | | | | | | | | | | Generators: Remove function declarations which do not have a definitionDaniel Eiband2019-09-212-3/+0
| |/ / / / / / / / / /
* | | | | | | | | | | Merge topic 'update-cached-is-generated-property'Brad King2019-09-243-2/+10
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8456f60dbc cmSourceFile: Remove non-const GetProperties accessor Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3848
| * | | | | | | | | | | cmSourceFile: Remove non-const GetProperties accessorDaniel Eiband2019-09-213-2/+10
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Manipulating the property map of cmSourceFile directly may invalidate the class invariant of the cached value IsGenerated. Provide the setter SetProperties which also updates IsGenerated.
* | | | | | | | | | | Merge topic 'free-free-set-them-free'Brad King2019-09-2419-1042/+763
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 920f0dd83a cmInstallCommand: Port away from cmCommand 1dd31297ca cmTargetLinkLibrariesCommand: Port away from cmCommand d5c63f073f cmSourceGroupCommand: Port away from cmCommand 42e413bcbb cmSetTargetPropertiesCommand: Port away from cmCommand 77aa75b8dc cmProjectCommand: Port away from cmCommand 9c521088df cmLoadCacheCommand: Port away from cmCommand fcfec154ac cmLinkDirectoriesCommand: Port away from cmCommand d038beec21 cmIncludeDirectoryCommand: Port away from cmCommand ... Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3829
| * | | | | | | | | | | cmInstallCommand: Port away from cmCommandRegina Pfeifer2019-09-213-345/+317
| | | | | | | | | | | |
| * | | | | | | | | | | cmTargetLinkLibrariesCommand: Port away from cmCommandRegina Pfeifer2019-09-213-178/+141
| | | | | | | | | | | |
| * | | | | | | | | | | cmSourceGroupCommand: Port away from cmCommandRegina Pfeifer2019-09-213-85/+49
| | | | | | | | | | | |
| * | | | | | | | | | | cmSetTargetPropertiesCommand: Port away from cmCommandRegina Pfeifer2019-09-213-50/+25
| | | | | | | | | | | |
| * | | | | | | | | | | cmProjectCommand: Port away from cmCommandRegina Pfeifer2019-09-213-139/+95
| | | | | | | | | | | |
| * | | | | | | | | | | cmLoadCacheCommand: Port away from cmCommandRegina Pfeifer2019-09-213-57/+35
| | | | | | | | | | | |
| * | | | | | | | | | | cmLinkDirectoriesCommand: Port away from cmCommandRegina Pfeifer2019-09-213-51/+18
| | | | | | | | | | | |