summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* CMake Nightly Date StampKitware Robot2019-09-271-1/+1
|
* Merge topic 'vs-ReferenceOutputAssembly-conditions'Brad King2019-09-267-27/+56
|\ | | | | | | | | | | | | | | | | 4dc8c153ec Tests: Teach VSWinStorePhone to verify the content of generated xap 481070a78a Tests: Teach VSWinStorePhone to verify the content of generated appx/msix acdb326610 VS: Do not reference output assemblies of targets with no output Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3778
| * Tests: Teach VSWinStorePhone to verify the content of generated xapVedran Vujinovic2019-09-251-2/+2
| | | | | | | | | | XAP format was used as app package format on Windows Phone 7 and 8. It was replaced by APPX format since Windows Phone 8.1.
| * Tests: Teach VSWinStorePhone to verify the content of generated appx/msixVedran Vujinovic2019-09-246-1/+54
| | | | | | | | | | | | Add a test to verify the content of generated UWP app package - appx/msix. MSIX format was introduced Visual Studio 2017 version 15.9.0 and Windows SDK version 17763.
| * VS: Do not reference output assemblies of targets with no outputVedran Vujinovic2019-09-191-26/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Our logic that sets `ReferenceOutputAssembly` in `ProjectReference` has accumulated a series of conditions for different cases in which the referenced target has no output. Simplify the condition to check `GetManagedType` directly for cases with no output. This will explicitly turn off `ReferenceOutputAssembly` in `ProjectReference` for utility (i.e. `add_custom_target`) and special targets (i.e. `ZERO_CHECK`, etc.), and allowing reference of target dependencies that produce some output. Fixes: #19665
* | Merge topic 'autogen_json'Brad King2019-09-2612-950/+1177
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | |
| * | cm/algorithm: Provide function cm::clampRegina Pfeifer2019-09-251-0/+38
| | |
* | | Merge topic 'pch-export'Brad King2019-09-265-1/+42
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-255-1/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2611-20/+46
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2411-20/+46
| | | | | | | | | | | | | | | | | | | | Fixes: #19730
* | | | | Merge topic 'add-custom-target-byproduct-checks'Brad King2019-09-2618-38/+205
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-236-8/+8
| | | | | |
| * | | | | add_custom_target: Add output checks for custom target byproductsDaniel Eiband2019-09-2311-43/+122
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-238-2/+90
| |/ / / /
* | | | | Merge topic 'cpack-DEB-use-CPACK_PACKAGE_DESCRIPTION_FILE'Kyle Edwards2019-09-2613-86/+328
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 33c7ea513d CPackDeb: Use `CPACK_PACKAGE_DESCRIPTION_FILE` 53be31e19c Refactor: Use `list` commands instead of old-way string ops b2c67a7703 Style: Remove spaces after command call and `(` Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3541
| * | | | | CPackDeb: Use `CPACK_PACKAGE_DESCRIPTION_FILE`Alex Turbov2019-09-2113-52/+305
| | | | | | | | | | | | | | | | | | | | | | | | Also, handle per-component description nicely.
| * | | | | Refactor: Use `list` commands instead of old-way string opsAlex Turbov2019-09-211-31/+20
| | | | | |
| * | | | | Style: Remove spaces after command call and `(`Alex Turbov2019-09-081-8/+8
| | | | | |
* | | | | | 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 branch 'release-3.15'Brad King2019-09-250-0/+0
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'vs-16.4-custom-commands' into release-3.15Brad King2019-09-242-3/+17
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !3860
* | \ \ \ \ \ \ \ 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 Nightly Date StampKitware Robot2019-09-251-1/+1
| |_|_|_|_|/ / |/| | | | | |
* | | | | | | Merge topic 'pch-relative-includes'Brad King2019-09-249-17/+89
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-239-17/+89
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'iar-v850-asm'Brad King2019-09-241-0/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 158f3795b8 IAR: Add v850 assembler support Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3856
| * | | | | | | IAR: Add v850 assembler supportNico Mueller2019-09-231-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Assembler compiler configuration for 'v850' architecture Issue: #17264
* | | | | | | | Merge topic 'FindThreads-lib-name'Brad King2019-09-241-4/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | de5f123d3a FindThreads: Do not hard-code '-l' flag on library name Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3857
| * | | | | | | | FindThreads: Do not hard-code '-l' flag on library nameAlan W. Irwin2019-09-231-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When not using the `-pthread` flag we instead return a library to link by name. Previously we hard-coded the `-l` flag before the library name. When used with `target_link_libraries`, the hard-coded `-l` flag is preserved rather than transformed into the link option preferred by the toolchain in use. Drop the explicit `-l` part to let CMake's generators produce the proper way to link the threads library for the current toolchain. Fixes: #19747
* | | | | | | | | Merge topic 'FindOpenSSL-static-deps'Brad King2019-09-241-5/+43
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8098bd5768 FindOpenSSL: add pthread and dl dependencies to static lib on Linux Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3820