summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'fix-getsafedef-stdstring'Brad King2018-09-196-14/+21
|\ | | | | | | | | | | | | | | 2428422c02 Fix regression in target output file naming logic d686f81e58 Restore possibly regressed CMP0018 logic Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2402
| * Fix regression in target output file naming logicBrad King2018-09-194-9/+19
| | | | | | | | | | | | | | | | | | | | Refactoring in commit f4ff60a803 (cmMakefile: Make GetSafeDefinition return std::string const&, 2018-09-05) accidentally changed the logic for target artifact prefix and suffix names such that setting a PREFIX or SUFFIX target property would cause an empty value to be used. Revert that part of the change and use a simpler alternative. Add a test case. Reported-by: Alan W. Irwin <irwin@beluga.phys.uvic.ca>
| * Restore possibly regressed CMP0018 logicBrad King2018-09-192-5/+2
| | | | | | | | | | | | Refactoring in commit f4ff60a803 (cmMakefile: Make GetSafeDefinition return std::string const&, 2018-09-05) changed the treatment of the empty string in CMP0018 diagnostic logic. Restore the behavior.
* | CMake Nightly Date StampKitware Robot2018-09-191-1/+1
| |
* | Merge topic 'vs-ipo'Brad King2018-09-187-8/+24
|\ \ | | | | | | | | | | | | | | | | | | | | | bef80e6623 VS: Do not specify incremental linking if LTCG is enabled 567fabe88e IPO: INTERPROCEDURAL_OPTIMIZATION (LTCG) for Visual Studio Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2363
| * | VS: Do not specify incremental linking if LTCG is enabledBrad King2018-09-171-3/+5
| | | | | | | | | | | | | | | | | | Otherwise the linker may warn: LNK4075: ignoring '/INCREMENTAL' due to '/LTCG' specification
| * | IPO: INTERPROCEDURAL_OPTIMIZATION (LTCG) for Visual StudioNiels Dekker2018-09-177-5/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | Add IPO support for Visual Studio (which is referred to by VS as "Link Time Code Generation" and "Whole Program Optimization"), for VS version >= 10. This allows CMake/VS users to enable IPO by setting property `INTERPROCEDURAL_OPTIMIZATION`. Fixes: #16748
* | | Merge topic 'link-options'Brad King2018-09-181-0/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 53ad52d66d LINK_OPTIONS: Add missing initialization actions Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2395
| * | | LINK_OPTIONS: Add missing initialization actionsMarc Chevrier2018-09-171-0/+3
| | | |
* | | | Merge topic 'getsafedef-stdstring'Brad King2018-09-1825-97/+99
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | f4ff60a803 cmMakefile: Make GetSafeDefinition return std::string const& Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2350
| * | | cmMakefile: Make GetSafeDefinition return std::string const&Vitaly Stakhovsky2018-09-1825-97/+99
| | | |
* | | | Merge topic 'if-version-docs'Brad King2018-09-181-5/+15
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2a2f0ac231 Help: Clarify handling of non-integer components in if() version tests Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2393
| * | | | Help: Clarify handling of non-integer components in if() version testsCraig Scott2018-09-171-5/+15
| | | | |
* | | | | Merge topic 'FindPython-updates'Brad King2018-09-185-63/+416
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 329f6aeca5 FindPython*: Windows: add facility to select lookup order for registry. ffb560adc9 FindPython*: MacOS: Fix erroneous handling of Frameworks. b0b53921ce FindPython: clean-up lookup names strategy Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2369
| * | | | | FindPython*: Windows: add facility to select lookup order for registry.Marc Chevrier2018-09-125-61/+244
| | | | | | | | | | | | | | | | | | | | | | | | Fixes: #18302
| * | | | | FindPython*: MacOS: Fix erroneous handling of Frameworks.Marc Chevrier2018-09-124-17/+180
| | | | | | | | | | | | | | | | | | | | | | | | Fixes: #18204
| * | | | | FindPython: clean-up lookup names strategyMarc Chevrier2018-09-121-3/+10
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2018-09-181-1/+1
| | | | | |
* | | | | | Merge topic 'cmake_rule_messages_doc'Brad King2018-09-173-1/+10
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 17e581af4c Help: Document CMAKE_RULE_MESSAGES variable Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2383
| * | | | | Help: Document CMAKE_RULE_MESSAGES variableJulien Schueller2018-09-173-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | Fixes: #18368
* | | | | | Merge topic 'link-options'Brad King2018-09-172-2/+10
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6da8b67c3f target_link_options: fix erroneous handling of BEFORE keyword. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2384
| * | | | | | target_link_options: fix erroneous handling of BEFORE keyword.Marc Chevrier2018-09-142-2/+10
| |/ / / / /
* | | | | | Merge topic 'docs/gen-see-also'Brad King2018-09-171-0/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e3f9ea8616 docs: add some 'see also' helper texts Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2381
| * | | | | | docs: add some 'see also' helper textsBrian Heim2018-09-131-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | in cmake-generator-expressions
* | | | | | | Merge topic 'FindCUDA-doc-typo'Brad King2018-09-171-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6209434b44 FindCUDA: Fix "alphabetical" typo Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2387
| * | | | | | | FindCUDA: Fix "alphabetical" typoNikolaus Wittenstein2018-09-141-2/+2
| | | | | | | |
* | | | | | | | Merge topic 'update-kwsys'Brad King2018-09-172-5/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 49e7a82c90 Merge branch 'upstream-KWSys' into update-kwsys b13c8526b1 KWSys 2018-09-14 (1809bedd) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2385
| * \ \ \ \ \ \ \ Merge branch 'upstream-KWSys' into update-kwsysBrad King2018-09-142-5/+5
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | * upstream-KWSys: KWSys 2018-09-14 (1809bedd)
| | * | | | | | | KWSys 2018-09-14 (1809bedd)KWSys Upstream2018-09-142-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://gitlab.kitware.com/utils/kwsys.git at commit 1809bedde0491d078ad42200bf2834c345e65398 (master). Upstream Shortlog ----------------- Ben Boeckel (2): b5b294c1 SystemTools::Split: fix copy-pasta comments ab0d44c9 SystemTools::Split: use str.find_first_of(char) Roger Leigh (1): bdd39241 Process: On Windows do not open stdin file with write permission
* | | | | | | | | CMake Nightly Date StampKitware Robot2018-09-171-1/+1
| | | | | | | | |
* | | | | | | | | CMake Nightly Date StampKitware Robot2018-09-161-1/+1
| |_|_|_|_|/ / / |/| | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2018-09-151-1/+1
|/ / / / / / /
* | | | | | | Merge topic 'out-of-dir-linking'Brad King2018-09-1460-88/+529
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a1ad0a699b target_link_libraries: Allow use with targets in other directories 9bbae5ae28 cmTarget: Future-proof AddLinkLibrary target lookup scope f9cb6f618a cmExportFileGenerator: Use cmGeneratorTarget::ResolveTargetReference 18441a6269 cmGeneratorTarget: Factor target name resolution out of link item resolution 2f708f5d65 Make internal TARGET_PROPERTY generator expressions more robust 94a75801c8 Android.mk: De-duplicate link libraries logic during export 8a63b23d16 cmGlobalGenerator: Remove unused FindLocalGenerator method Acked-by: Kitware Robot <kwrobot@kitware.com> Reviewed-by: Patrick Stotko <stotko@cs.uni-bonn.de> Merge-request: !2370
| * | | | | | | target_link_libraries: Allow use with targets in other directoriesBrad King2018-09-1256-44/+460
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously the command did not allow naming targets on the LHS that were not created in the calling directory. Lift this restriction to enable more flexible use by projects. Targets named on the RHS will need to be looked up during generation in the scope of the call site rather than the scope of the LHS target. Introduce an internal syntax in `[INTERFACE_]LINK_LIBRARIES` properties to specify target names that need to be looked up in a directory other than that containing the target on which the property is set. Add minimal documentation of the syntax to help users that encounter it. Unfortunately CMake previously did allow such calls in the case that only `INTERFACE` libraries are specified, but those libraries would be looked up in the target's directory rather than the caller's. Add policy `CMP0079` to enable the new behavior with new lookup scope in a compatible way. Fixes: #17943
| * | | | | | | cmTarget: Future-proof AddLinkLibrary target lookup scopeBrad King2018-09-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `AddLinkLibrary` method takes a `cmMakefile` pointer to represent the scope of the caller that wants to link to the named library. Currently in all call sites this is the same as the target's `Makefile` member, but in principle the library named by the caller is visible in its scope so we should use the `cmMakefile` it provided to look up the library target.
| * | | | | | | cmExportFileGenerator: Use cmGeneratorTarget::ResolveTargetReferenceBrad King2018-09-121-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid calling `FindGeneratorTargetToUse` directly.
| * | | | | | | cmGeneratorTarget: Factor target name resolution out of link item resolutionBrad King2018-09-122-10/+31
| | | | | | | |
| * | | | | | | Make internal TARGET_PROPERTY generator expressions more robustBrad King2018-09-124-3/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While collecting usage requirements from the `INTERFACE_*` properties of directly linked targets, we internally generate `TARGET_PROPERTY:` and `TARGET_OBJECTS:` generator expressions to refer to those properties on those targets. At the point we generate these expressions we already have a pointer to an exact `cmGeneratorTarget` instance. Switch from using the target name in these generator expressions to using an internal unique name generated for each `cmGeneratorTarget` instance to be referenced. This avoids depending on the user-facing target name to find the same target we already have.
| * | | | | | | Android.mk: De-duplicate link libraries logic during exportBrad King2018-09-111-21/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the normal target link interface computation logic to get the list of libraries in the link interface instead of trying to interpret the `INTERFACE_LINK_LIBRARIES` property directly.
| * | | | | | | cmGlobalGenerator: Remove unused FindLocalGenerator methodBrad King2018-09-112-15/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This method has not been used since commit v3.4.0-rc1~234^2~1 (cmGlobalGenerator: Port Find API to cmMakefile, 2015-08-02).
* | | | | | | | Merge topic 'module_policy_protection'Brad King2018-09-145-2/+27
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8ede35523e IN_LIST: Ensure policy allows if(IN_LIST) if used by a module e549e31f79 CMakeIOSInstallCombined: Prevent policy leakage Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2375
| * | | | | | | | IN_LIST: Ensure policy allows if(IN_LIST) if used by a moduleCraig Scott2018-09-124-0/+20
| | | | | | | | |
| * | | | | | | | CMakeIOSInstallCombined: Prevent policy leakageCraig Scott2018-09-121-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Functions do not introduce a new policy scope, so surround these policy changes with a push-pop to prevent them from affecting the caller.
* | | | | | | | | Merge topic 'boost-notfound'Brad King2018-09-141-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ee300dc25d FindBoost: Suppress imported targets warning if Boost was not found Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2376
| * | | | | | | | | FindBoost: Suppress imported targets warning if Boost was not foundRoger Leigh2018-09-121-1/+1
| | |_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #18330
* | | | | | | | | Merge topic 'ctest-stop-time-test'Brad King2018-09-144-18/+44
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ed71ec7579 CTest: Improve stop-time implementation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2378
| * | | | | | | | | CTest: Improve stop-time implementationBrad King2018-09-124-18/+44
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The CTestTestStopTime test has been failing sporadically because the stop time causes the first internal test to have a timeout short enough that we might hit it and start the second test just before the stop time is reached. Instead we should track when a timeout is shortened in order to stay within the stop time. If a test times out for this reason then we should consider the stop time reached and not start any more tests.
* | | | | | | | | Merge topic 'test-ninja-sub-build-fs-delay'Brad King2018-09-141-4/+5
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bdd0e2d709 Tests: Extend RunCMake.Ninja filesystem delays Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2310
| * | | | | | | | Tests: Extend RunCMake.Ninja filesystem delaysBrad King2018-09-121-4/+5
| | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On filesystems with 1s resolution the `run_sub_cmake` cases fail occasionally when the 1 second sleep does not cause files to have a different time. Use 3 seconds instead.
* | | | | | | | CMake Nightly Date StampKitware Robot2018-09-141-1/+1
| |_|_|_|_|/ / |/| | | | | |
generated by cgit v0.12 at 2025-01-31 00:52:32 (GMT)