summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'static-library-flags'Brad King2019-07-221-5/+7
|\ | | | | | | | | | | | | 59f2aa63e4 Swift: fix static library handling Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3576
| * Swift: fix static library handlingSaleem Abdulrasool2019-07-191-5/+7
| | | | | | | | | | | | Handle static libraries similar to shared libraries. Do not pass along the shared library flags raw as that will pass flags for the linker to the driver which is incorrect.
* | Merge topic 'refactor-usage-requirements'Brad King2019-07-223-294/+245
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2682714a3f cmGeneratorTarget: Refactor usage requirement genex evaluation 3cbc15773f cmGeneratorTarget: Move static functions to anonymous namespace 33494a507d cmGeneratorTarget: Order usage requirement processing logic consistently c131e62f7b cmGeneratorTarget: Remove unnecessary copy to local variable fab72918c9 cmGeneratorTarget: Remove unused member of internal class 95d3598e04 cmGeneratorExpressionDAGChecker: Avoid const_cast Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Marc Chevrier <marc.chevrier@gmail.com> Merge-request: !3578
| * | cmGeneratorTarget: Refactor usage requirement genex evaluationBrad King2019-07-191-270/+209
| | | | | | | | | | | | | | | | | | | | | | | | | | | Evaluate usage requirement generator expressions fully before entering the processing loops. This allows us to evaluate and collect all entries up front and then have only one call to the loop over them. This also allows `AddInterfaceEntries` to immediately evaluate the generator expressions it synthesizes, which will enable later optimization.
| * | cmGeneratorTarget: Move static functions to anonymous namespaceBrad King2019-07-191-26/+43
| | |
| * | cmGeneratorTarget: Order usage requirement processing logic consistentlyBrad King2019-07-191-10/+11
| | | | | | | | | | | | | | | Re-order logic in all `process*` methods so that they all evaluate generator expressions at the beginning of their loops.
| * | cmGeneratorTarget: Remove unnecessary copy to local variableBrad King2019-07-191-4/+3
| | |
| * | cmGeneratorTarget: Remove unused member of internal classBrad King2019-07-191-3/+0
| | |
| * | cmGeneratorExpressionDAGChecker: Avoid const_castBrad King2019-07-192-4/+2
| | | | | | | | | | | | Make a member mutable to avoid casting away const of a whole object.
* | | Merge topic 'cpack-install-scripts'Craig Scott2019-07-2210-24/+62
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 5f96601675 CPack: Introduce CPACK_INSTALL_SCRIPTS variable Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3531
| * | | CPack: Introduce CPACK_INSTALL_SCRIPTS variableAlex Turbov2019-07-2110-24/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The singular name `CPACK_INSTALL_SCRIPT` has existed but was not linked from the CPack documentation. Also, it supported multiple values and should have had a plural name. Add a plural-named alternative now. If both `CPACK_INSTALL_SCRIPTS` and `CPACK_INSTALL_SCRIPT` are set then ignore the latter with a warning. Signed-off-by: Alex Turbov <i.zaufi@gmail.com>
* | | | Merge topic 'feature/message-indent'Craig Scott2019-07-2211-14/+144
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5f6fd917a3 message(): Control indentation via CMAKE_MESSAGE_INDENT Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3464
| * | | | message(): Control indentation via CMAKE_MESSAGE_INDENTAlex Turbov2019-07-2111-14/+144
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2019-07-221-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2019-07-211-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2019-07-201-1/+1
| | | | |
* | | | | Merge topic 'skip_regular_expression'Kyle Edwards2019-07-1912-7/+100
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5dbd9c8583 Vim: Add SKIP_REGULAR_EXPRESSION test property to vim syntax file 407dd1a910 Help: Add documentation for SKIP_REGULAR_EXPRESSION test property d7955d4e5d Tests: Create test for SKIP_REGULAR_EXPRESSION test property 4f1dec86a5 CTest: Add SKIP_REGULAR_EXPRESSION test property Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3570
| * | | | | Vim: Add SKIP_REGULAR_EXPRESSION test property to vim syntax fileGabor Bencze2019-07-181-0/+2
| | | | | |
| * | | | | Help: Add documentation for SKIP_REGULAR_EXPRESSION test propertyGabor Bencze2019-07-185-2/+33
| | | | | |
| * | | | | Tests: Create test for SKIP_REGULAR_EXPRESSION test propertyGabor Bencze2019-07-182-0/+27
| | | | | |
| * | | | | CTest: Add SKIP_REGULAR_EXPRESSION test propertyGabor Bencze2019-07-184-5/+38
| | | | | |
* | | | | | Merge topic 'command-final-action'Brad King2019-07-1915-316/+262
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 732dd344b9 cmCommand: remove FinalPass from interface fbee46e262 cmVariableWatchCommand: Port away from FinalPass 360d415592 cmLoadCommandCommand: Port away from FinalPass 316e40baec cmInstallProgramsCommand: Port away from FinalPass 7bc88b9165 cmInstallFilesCommand: Port away from FinalPass 6a1a3763ee cmFLTKWrapUICommand: Port away from FinalPass 20169f0b8d cmExportLibraryDependenciesCommand: Port away from FinalPass a74dad3bd3 cmMakefile: decouple FinalAction from cmCommand ... Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3562
| * | | | | | cmCommand: remove FinalPass from interfaceDaniel Pfeifer2019-07-183-34/+0
| | | | | | |
| * | | | | | cmVariableWatchCommand: Port away from FinalPassDaniel Pfeifer2019-07-182-22/+33
| | | | | | |
| * | | | | | cmLoadCommandCommand: Port away from FinalPassDaniel Pfeifer2019-07-181-19/+5
| | | | | | |
| * | | | | | cmInstallProgramsCommand: Port away from FinalPassDaniel Pfeifer2019-07-182-40/+29
| | | | | | |
| * | | | | | cmInstallFilesCommand: Port away from FinalPassDaniel Pfeifer2019-07-182-52/+38
| | | | | | |
| * | | | | | cmFLTKWrapUICommand: Port away from FinalPassDaniel Pfeifer2019-07-182-47/+28
| | | | | | |
| * | | | | | cmExportLibraryDependenciesCommand: Port away from FinalPassDaniel Pfeifer2019-07-182-41/+24
| | | | | | |
| * | | | | | cmMakefile: decouple FinalAction from cmCommandDaniel Pfeifer2019-07-182-6/+32
| | | | | | |
| * | | | | | cmLoadCommandCommand: Code cleanupRegina Pfeifer2019-07-181-73/+91
| | | | | | |
* | | | | | | Merge topic 'swift-deduplicate'Brad King2019-07-191-16/+10
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 151ef7cef4 Swift: refactor rule construction to reduce duplication Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3551
| * | | | | | | Swift: refactor rule construction to reduce duplicationSaleem Abdulrasool2019-07-171-16/+10
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the placeholder expansion to avoid constructing the `-target` option by hand if specified. This reduces duplication and simplifies the rules.
* | | | | | | Merge topic 'FindProtobuf-DLLs'Brad King2019-07-191-0/+15
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3bbd85d5ff FindProtobuf: Fix usage of protobuf dynamic libraries on Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3555
| * | | | | | | FindProtobuf: Fix usage of protobuf dynamic libraries on Windowsgnaggnoyil2019-07-181-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Define `PROTOBUF_USE_DLLS` on Windows when linking against dynamic protobuf libraries so that we import symbols from them. We use the condition `MSVC` to enable this because that is what the upstream buildsystem uses.
* | | | | | | | Merge branch 'release-3.15'Brad King2019-07-190-0/+0
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'ctest-done-hash' into release-3.15Brad King2019-07-191-9/+9
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !3563
* | \ \ \ \ \ \ \ \ Merge topic 'ctest-done-hash'Brad King2019-07-191-9/+9
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | da79075c4d CTest: Generate Done.xml before calculating its hash Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3563
| * | | | | | | | | CTest: Generate Done.xml before calculating its hashBetsy McPhail2019-07-191-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #19489
* | | | | | | | | | Merge topic 'QCC-ninja-support'Brad King2019-07-191-1/+3
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8738e2584a cmGlobalNinjaGenerator: Use gnu compatible paths with QCC Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3567
| * | | | | | | | | | cmGlobalNinjaGenerator: Use gnu compatible paths with QCCSamuel Ostlund2019-07-161-1/+3
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
* | | | | | | | | | Merge topic 'modernize_std_unique_ptr'Brad King2019-07-1910-81/+100
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3bed969dac cmMakefile: Modernize AddFunctionBlocker method to accept a std::unique_ptr faacb90a13 cmELF: Modernize to use std::unique_ptr instead of new/delete Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3548
| * | | | | | | | | | cmMakefile: Modernize AddFunctionBlocker method to accept a std::unique_ptrSebastian Holtermann2019-07-178-53/+71
| | | | | | | | | | |
| * | | | | | | | | | cmELF: Modernize to use std::unique_ptr instead of new/deleteSebastian Holtermann2019-07-172-28/+29
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'release-3.15'Brad King2019-07-190-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge branch 'msvc-runtime-library-doc' into release-3.15Brad King2019-07-193-1/+11
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !3573
| * \ \ \ \ \ \ \ \ \ Merge branch 'vs-asmlist-dir' into release-3.15Brad King2019-07-182-4/+2
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !3569
* | \ \ \ \ \ \ \ \ \ \ Merge topic 'msvc-runtime-library-doc'Brad King2019-07-193-1/+11
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 282d9f3168 MSVC: Document behavior when MSVC_RUNTIME_LIBRARY is not set Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3573
| * | | | | | | | | | | MSVC: Document behavior when MSVC_RUNTIME_LIBRARY is not setBrad King2019-07-193-1/+11
| | |_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By default `CMAKE_MSVC_RUNTIME_LIBRARY` is not set. Document the default runtime library selection in that case. We already test it.
* | | | | | | | | | | Merge topic 'vs-asmlist-dir'Brad King2019-07-192-4/+2
|\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c1fc6c80c7 VS: Place intermediate files in the "ASM List Location" next to objects Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3569