summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* cmMakefile: Keep function blockers in a stackRegina Pfeifer2019-07-262-46/+30
| | | | Highlight the fact that we only ever operate on the top element.
* Merge topic 'cmake-version-rc'Brad King2019-07-262-2/+2
|\ | | | | | | | | | | | | eb5ea5a505 CMakeVersion: Use '-rc0' version suffix on release branches prior to rc1 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3609
| * CMakeVersion: Use '-rc0' version suffix on release branches prior to rc1Brad King2019-07-262-2/+2
| | | | | | | | | | | | | | | | | | | | Revert the change from commit 7b354baad5 (CMakeVersion: Set CMake_VERSION_RC to 0 even in non-rc versions, 2019-07-25) and instead define a `0` value in `CMake_VERSION_RC` to mean `-rc0`. This distinguishes release branch versions prior to the first release candidate from the first release candidate itself. It also makes room for a dedicated "CMake $major.$minor.0-rc1" release commit for `-rc1` as we have for later release candidates and final releases.
* | Merge topic 'ep_support_no_submodule_init'Kyle Edwards2019-07-261-1/+5
|\ \ | | | | | | | | | | | | | | | | | | d6be117ca0 ExternalProject: Support not initializing any submodules Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3579
| * | ExternalProject: Support not initializing any submodulesRobert Maynard2019-07-241-1/+5
| | | | | | | | | | | | Fixes #15592
* | | Merge topic 'remove_compiler_rpath'Kyle Edwards2019-07-265-5/+22
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | bd2793b6e9 Help: Add documentation for INSTALL_REMOVE_ENVIROMENT_RPATH f08dcbffec Property: Add INSTALL_REMOVE_ENVIROMENT_RPATH property Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3544
| * | Property: Add INSTALL_REMOVE_ENVIROMENT_RPATH propertyJiang Yue2019-07-255-5/+22
| | |
* | | Merge topic 'optimize-usage-requirements'Brad King2019-07-264-137/+231
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1d3841b600 Genex: Memoize usage requirement TARGET_PROPERTY existence b5460f9931 cmLinkItem: Expose HadHeadSensitiveCondition in cmLinkInterfaceLibraries ad2b3a32d1 Genex: Optimize build setting TARGET_PROPERTY evaluation 11fa818ecd Genex: Optimize usage requirement TARGET_PROPERTY recursion 0239bf8ac8 Genex: In TARGET_PROPERTY check for usage reqs in link libs earlier 7caebeb0e4 Genex: Re-order TARGET_PROPERTY logic to de-duplicate checks b2785a0fbd Genex: Move TARGET_PROPERTY linked targets evaluation to end Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Cristian Adam <cristian.adam@gmail.com> Merge-request: !3589
| * | | Genex: Memoize usage requirement TARGET_PROPERTY existenceBrad King2019-07-232-0/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For each usage requirement (such as `INTERFACE_COMPILE_DEFINITIONS` or `INTERFACE_INCLUDE_DIRECTORIES`), the value of the generator expression `$<TARGET_PROPERTY:target,prop>` includes the values of the same property from the transitive closure of link libraries of the target. In cases that a target's transitive closure of dependencies does not depend on the target being linked (the "head" target), we can memoize whether or not a usage requirement property exists at all for that target. When a usage requirement does not exist for a target, we can skip evaluating it for every consuming target. Fixes: #18964, #18965
| * | | cmLinkItem: Expose HadHeadSensitiveCondition in cmLinkInterfaceLibrariesBrad King2019-07-231-1/+3
| | | | | | | | | | | | | | | | | | | | Clients may be able to avoid repeating work if they know the transitive link interface libraries do not depend on what is linking them.
| * | | Genex: Optimize build setting TARGET_PROPERTY evaluationBrad King2019-07-232-54/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For each build setting property (such as `COMPILE_DEFINITIONS` or `INCLUDE_DIRECTORIES`), the value of `$<TARGET_PROPERTY:target,prop>` includes the values of the corresponding `INTERFACE_*` usage requirement property from the transitive closure of link libraries of the target. Previously we computed this by constructing a generator expression string like `$<TARGET_PROPERTY:lib,INTERFACE_COMPILE_DEFINITIONS>` and recursively evaluating it with the generator expression engine. Avoid the string construction and parsing by using the dedicated evaluation method `cmGeneratorTarget::EvaluateInterfaceProperty`. Issue: #18964, #18965
| * | | Genex: Optimize usage requirement TARGET_PROPERTY recursionBrad King2019-07-233-22/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In large projects the generation process spends a lot of time evaluating usage requirements through transitive interface properties on targets. This can be seen in a contrived example with deep dependencies: set(prev "") foreach(i RANGE 1 500) add_library(a${i} a.c) target_compile_definitions(a${i} PUBLIC A${i}) target_link_libraries(a${i} PUBLIC ${prev}) set(prev a${i}) endforeach() For each usage requirement (such as `INTERFACE_COMPILE_DEFINITIONS` or `INTERFACE_INCLUDE_DIRECTORIES`), the value of the generator expression `$<TARGET_PROPERTY:target,prop>` includes the values of the same property from the transitive closure of link libraries of the target. Previously we computed this by constructing a generator expression string like `$<TARGET_PROPERTY:lib,INTERFACE_COMPILE_DEFINITIONS>` and recursively evaluating it with the generator expression engine. Avoid the string construction and parsing by creating and using a dedicated evaluation method `cmGeneratorTarget::EvaluateInterfaceProperty` that looks up the properties directly. Issue: #18964, #18965
| * | | Genex: In TARGET_PROPERTY check for usage reqs in link libs earlierBrad King2019-07-211-25/+26
| | | |
| * | | Genex: Re-order TARGET_PROPERTY logic to de-duplicate checksBrad King2019-07-211-42/+26
| | | | | | | | | | | | | | | | | | | | Check for usage requirement properties early enough to avoid duplicate checks in other conditions.
| * | | Genex: Move TARGET_PROPERTY linked targets evaluation to endBrad King2019-07-211-35/+28
| | | |
* | | | Merge topic 'definitions_string_view'Brad King2019-07-2663-314/+281
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e91bfe440c cmMakefile: Let AddDefinition accept a value as cm::string_view f2ba968ef2 cmMakefile: Simplify and rename AddDefinitionBool 9b5cc42531 cmDefinitions: Remove const char* based Set method e268840c0a cmDefinitions: Add Unset and cm::string_view based Set methods 451fd329a8 cmDefinitions: Cleanups Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3577
| * | | | cmMakefile: Let AddDefinition accept a value as cm::string_viewSebastian Holtermann2019-07-2456-256/+226
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changes `cmMakefile::AddDefinition` to take a `cm::string_view` as value argument instead of a `const char *`. Benefits are: - `std::string` can be passed to `cmMakefile::AddDefinition` directly without the `c_str()` plus string length recomputation fallback. - Lengths of literals passed to `cmMakefile::AddDefinition` can be computed at compile time. In various sources uses of `cmMakefile::AddDefinition` are adapted to avoid `std::string::c_str` calls and the `std::string` is passed directly. Uses of `cmMakefile::AddDefinition`, where a `nullptr` `const char*` might be passed to `cmMakefile::AddDefinition` are extended with `nullptr` checks.
| * | | | cmMakefile: Simplify and rename AddDefinitionBoolSebastian Holtermann2019-07-246-26/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This simplifies the `cmMakefile::AddDefinition` method with bool value overload to call the string based `cmMakefile::AddDefinition` method with either an "ON" or "OFF" string. Also the method is renamed to `cmMakefile::AddDefinitionBool`
| * | | | cmDefinitions: Remove const char* based Set methodSebastian Holtermann2019-07-244-17/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Removes `cmDefinitions::Set` method overload that takes a `const char*` value argument. - Updates calls to `cmDefinitions::Set` to use the `cm::string_view` based version instead.
| * | | | cmDefinitions: Add Unset and cm::string_view based Set methodsSebastian Holtermann2019-07-242-17/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - The `cmDefinitions::Def` struct is simplified by removing an unused constructor and the `std_string` type definition. The std::string value becomes a member variable instead of being derived from. - The `cmDefinitions::Unset` method is added that unsets a definition. It has the same functionality as calling `cmDefinitions::Set` with a `nullptr` value argument, - The `cmDefinitions::Set` method gets an overloaded version that takes a `cm::string_view` as value argument. - The originl `cmDefinitions::Set` method with `const char*` argument is refactored to either call the `cm::string_view` based `cmDefinitions::Set` overload or `cmDefinitions::Unset`, depending on whether the value `const char*` is a nullptr (`Unset`) or not (`Set`).
| * | | | cmDefinitions: CleanupsSebastian Holtermann2019-07-241-8/+9
| | | | |
* | | | | Merge topic 'IsON_IsOFF_string_view'Brad King2019-07-264-144/+109
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4ff0bb054b cmSystemTools: Make IsInternallyOn, IsON and IsOff cm::string_view based 65d3ea2c7f cmAlgorithms: Make cmHasLiteral{Prefix,Suffix} cm::string_view based Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3598
| * | | | | cmSystemTools: Make IsInternallyOn, IsON and IsOff cm::string_view basedSebastian Holtermann2019-07-242-104/+94
| | | | | |
| * | | | | cmAlgorithms: Make cmHasLiteral{Prefix,Suffix} cm::string_view basedSebastian Holtermann2019-07-242-40/+15
| | | | | |
* | | | | | Merge topic 'update-kwsys'Brad King2019-07-264-15/+22
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | aff019f7a4 Merge branch 'upstream-KWSys' into update-kwsys 780d9e070b KWSys 2019-07-25 (a24a6acb) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3602
| * | | | | | Merge branch 'upstream-KWSys' into update-kwsysBrad King2019-07-254-15/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream-KWSys: KWSys 2019-07-25 (a24a6acb)
* | | | | | | Merge topic 'variable-typo'Brad King2019-07-261-7/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 94f536b935 cmCTestHandlerCommand: fix typo of local variable Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3600
| * | | | | | | cmCTestHandlerCommand: fix typo of local variableBen Boeckel2019-07-241-7/+7
| | |/ / / / / | |/| | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2019-07-261-1/+1
| |_|_|_|/ / |/| | | | |
* | | | | | CMakeVersion: Set CMake_VERSION_RC to 0 even in non-rc versionsBrad King2019-07-251-1/+1
| |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | The logic that uses this value already ignores any "false" value, so `0` is just as good as not being set at all. Using `0` for this role makes the version components look more symmetric and reduces the number of edits needed when creating releases.
* | | | | Merge topic 'ninja-swift-map-file-path'Brad King2019-07-251-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3391a3eca8 Ninja: do not normalise swift support file paths Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3597
| * | | | | Ninja: do not normalise swift support file pathsSaleem Abdulrasool2019-07-241-2/+2
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When building the output-map-file.json, do not convert the path to a Ninja path, which will make it relative. If `cmake` is invoked with the `-B` option the files will be written relative to the directory where CMake was invoked rather than relative to the build tree. This path need not be a relative path since it is used internally by CMake to determine where to write the output map file. This allows the use of `-B` option in CMake in projects with Swift targets.
* | | | | Merge topic 'makefile-depend-relative-include'Brad King2019-07-252-3/+12
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d46bac5d38 Makefile: Fix regression in dependencies on relative includes Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3599
| * | | | | Makefile: Fix regression in dependencies on relative includesBrad King2019-07-242-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit a13a5c948e (Replace use of CollapseCombinedPath with CollapseFullPath, 2019-03-19, v3.15.0-rc1~361^2~1), one code path now calls `CollapseFullPath` with a base path that may be relative. Backport KWSys commit c6f8e24a3 (SystemTools: Fix CollapseFullPath with relative base path, 2019-07-24) to handle such base paths. This case occurs when a build tree is placed in a directory inside a source tree such that CMake is willing to generate a relative path from the build tree to the source tree. Add a test covering this case. Fixes: #19507
* | | | | | CMake Nightly Date StampKitware Robot2019-07-251-1/+1
| |_|/ / / |/| | | |
* | | | | Merge topic 'find_pkg_use_new_global_controls'Brad King2019-07-241-0/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 609fe39043 FindPackage: Support `NO_[]_PATH` global call options ff29c92df6 Tests: find_file restore PATH env variable after test runs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3590
| * | | | | FindPackage: Support `NO_[]_PATH` global call optionsRobert Maynard2019-07-221-0/+3
| | | | | |
* | | | | | Merge topic 'math_exp_not'Brad King2019-07-242-57/+71
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d427f12b73 math(EXPR): Implement ~(exp_NOT) expression as documented Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3582
| * | | | | | math(EXPR): Implement ~(exp_NOT) expression as documentedGabor Bencze2019-07-232-57/+71
| | |_|/ / / | |/| | | | | | | | | | | | | | | | Fixes: #19252
* | | | | | Merge topic 'fix-emulator-arguments'Brad King2019-07-241-1/+1
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | bf6f5467a0 Fix allocation in CROSSCOMPILING_EMULATOR evaluation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3591
| * | | | | Fix allocation in CROSSCOMPILING_EMULATOR evaluationMarek Antoniak2019-07-231-1/+1
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit fec441ec17 (Teach CROSSCOMPILING_EMULATOR to support arguments, 2019-05-30, v3.15.0-rc1~6^2) the new member `cmCustomCommandGenerator::EmulatorsWithArguments` was not initialized to the proper size. Fix this and add a test case covering the crash that could occur with multiple commands where an emulator appears only in a later command. Fixes: #19500 Co-Author: Brad King <brad.king@kitware.com>
* | | | | CMake Nightly Date StampKitware Robot2019-07-241-1/+1
| |/ / / |/| | |
* | | | Merge topic 'parsers-bison-3.3'Brad King2019-07-238-1225/+1273
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8f0b3f92d5 LexerParser: Regenerate parsers with bison 3.3 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3588
| * | | | LexerParser: Regenerate parsers with bison 3.3Brad King2019-07-228-1225/+1273
| | |/ / | |/| | | | | | | | | | Run `Utilities/Scripts/regenerate-parsers.bash`.
* | | | Merge topic 'cmHasLiteralPrefix_cm_string_view'Brad King2019-07-231-9/+28
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 301f5356fd cmAlgorithms: Make cmHasPrefix and cmHasSuffix cm::string_view based Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Daniel Pfeifer <daniel@pfeifer-mail.de> Merge-request: !3583
| * | | | cmAlgorithms: Make cmHasPrefix and cmHasSuffix cm::string_view basedSebastian Holtermann2019-07-221-9/+28
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make `cmHasPrefix`, `cmHasSuffix` and `cmStripSuffixIfExists` accept arguments as `cm::string_view` instead of `const std::string&`. This lets them accept literal strings without having to allocate a temporary `std::string`. Add variants of `cmHasPrefix`, `cmHasSuffix` and `cmStripSuffixIfExists` that accept a single character as second argument.
* | | | Merge topic 'make-imported-targets-more-equal'Brad King2019-07-231-3/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 680a3c63bb target_*: Allow setting INTERFACE properties of UNKNOWN IMPORTED targets 62b5d1e4ad cmTargetPropCommandBase: Order target type condition by order in enum Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3581
| * | | | target_*: Allow setting INTERFACE properties of UNKNOWN IMPORTED targetsAvraham Shukron2019-07-221-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend the change made by commit fe4b25ec2f (Teach target_* commands to set INTERFACE properties of IMPORTED targets, 2017-09-18, v3.11.0-rc1~433^2~2) to work with imported targets of type `UNKNOWN`. Fixes: #19434
| * | | | cmTargetPropCommandBase: Order target type condition by order in enumAvraham Shukron2019-07-221-4/+4
| | | | | | | | | | | | | | | | | | | | This improves readability.
* | | | | Merge topic 'command-refactoring3'Brad King2019-07-2328-382/+244
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dfaa87f1b3 cmState: Support BuiltinCommands as free functions 28f2d12a05 cmCommand: De-virtualize function InvokeInitialPass de77d355ac cmState: Add scripted commands by value 0101ace131 cmUnexpectedCommand: Replace with lambda expression 015001aaf1 cmState: Hold commands by value 1eebc29563 cmCommand: deprecate functions GetMakefile and SetError Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3574