summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Help: Expand placeholders in string comparisons.Joachim Wuttke (h)2018-11-061-6/+8
| | | | And point out that STREQUAL is case sensitive.
* Help: sort conditional expressions below string-valued ones.Joachim Wuttke (h)2018-11-061-30/+29
| | | | | Makes things yet clearer and simpler. Also correct remnant of "informational expression".
* Help: Add deprecation date of $<CONFIGURATION>Joachim Wuttke (h)2018-11-061-1/+1
|
* Help: Add note on omitted <..> notation in cmake-generator-expressions(7)Joachim Wuttke (h)2018-11-061-0/+5
|
* Help: Revise documentation of string-valued generator expressionsJoachim Wuttke (h)2018-11-061-92/+111
| | | | | * Consolidate examples * Sort, and insert subsection headers
* Help: 3 subtypes of boolean generator expressions.Joachim Wuttke (h)2018-11-061-10/+20
| | | | | Main classification by return type, subclassification by dependences
* Help: Cross-link conditional and boolean expressions.Joachim Wuttke (h)2018-11-061-18/+24
| | | | | Rename Logical -> Boolean Generator Expressions. It's the return type that helps us to sort the expression zoo.
* Help: new section on conditional generator expressionsJoachim Wuttke (h)2018-11-061-8/+15
| | | | | | | | | Before, the closely related signatures $<condition:true_value> $<IF:condition,true_value,false_value> were explained in two different sections. The former section was badly explained, with '0' and '1' in place of the formal parameter 'condition'.
* Help: rm unmotivated "This means that"Joachim Wuttke (h)2018-11-061-4/+4
| | | | | | | That generator expressions enable conditional things has not been said before. Amended for nicer source format.
* Help: expand "ver", "pol", ...Joachim Wuttke (h)2018-11-061-19/+23
| | | | | | | No need to save a few characters on formal parameters. Use this occasion to correct $<PLATFORM_ID:comp>: the parameter is a platform_id, not a compiler_id.
* Help: expand "..." and "?" in logical generator expressionsJoachim Wuttke (h)2018-11-061-13/+20
| | | | | | Expand "..." and "?", which could be mistaken as metacharacters (and in the explanations of AND and OR actually were meant as metacharacters).
* CMake Nightly Date StampKitware Robot2018-11-061-1/+1
|
* Merge topic 'lwyu-hides-link-error'Brad King2018-11-051-1/+0
|\ | | | | | | | | | | | | 85aceda026 cmNinjaNormalTargetGenerator: don't use `|| true` for link-what-you-use Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2546
| * cmNinjaNormalTargetGenerator: don't use `|| true` for link-what-you-useBen Boeckel2018-11-021-1/+0
| | | | | | | | | | | | | | | | With the `|| true`, a linker error before running link-what-you-use would also use the `|| true` fragment and unconditionally succeed. Just skip the addition since `--lwyu=` ignores the return value anyways. Fixes #18524
* | Merge branch 'release-3.13'Brad King2018-11-050-0/+0
|\ \
| * \ Merge branch 'custom-command-work-dir-genex' into release-3.13Brad King2018-11-054-15/+8
| |\ \ | | | | | | | | | | | | Merge-request: !2559
| * \ \ Merge branch 'update-curl' into release-3.13Brad King2018-11-05127-2180/+5100
| |\ \ \ | | | | | | | | | | | | | | | Merge-request: !2550
* | \ \ \ Merge topic 'update-curl'Brad King2018-11-05127-2180/+5100
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c1ad5118de curl: backport upstream fix to 7.62.0 regression 03bf934fbe curl: Modernize tiny test code used for build inside CMake 2b3c1bb9b0 curl: Update build within CMake to account for 7.62 changes 636bcefeab Merge branch 'upstream-curl' into update-curl 9835e90750 curl 2018-10-30 (19667715) 9c6574795c curl: Update script to get curl 7.62.0 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2550
| * | | | curl: backport upstream fix to 7.62.0 regressionBrad King2018-11-021-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport upstream curl commit 2c5ec339ea (Curl_follow: accept non-supported schemes for "fake" redirects, 2018-11-01) to get a fix to curl issue 3210, a regression in 7.62.0.
| * | | | curl: Modernize tiny test code used for build inside CMakeBrad King2018-11-013-134/+57
| | | | | | | | | | | | | | | | | | | | | | | | | Drop unused code. Report the error message on failure. Format the source file using clang-format.
| * | | | curl: Update build within CMake to account for 7.62 changesBrad King2018-10-311-0/+2
| | | | |
| * | | | Merge branch 'upstream-curl' into update-curlBrad King2018-10-31124-2046/+5040
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * upstream-curl: curl 2018-10-30 (19667715)
| | * | | | curl 2018-10-30 (19667715)Curl Upstream2018-10-31124-2052/+5051
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://github.com/curl/curl.git at commit 196677150f711a96c38ed123e621f1d4e995b2e5 (curl-7_62_0).
| * | | | | curl: Update script to get curl 7.62.0Brad King2018-10-311-1/+1
| | | | | |
* | | | | | Merge topic 'custom-command-work-dir-genex'Brad King2018-11-054-15/+8
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 98d59417b0 add_custom_{command,target}: Fix WORKING_DIRECTORY leading genex Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2559
| * | | | | add_custom_{command,target}: Fix WORKING_DIRECTORY leading genexBrad King2018-11-034-15/+8
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.13.0-rc1~39^2 (add_custom_{command,target}: WORKING_DIRECTORY generator expressions, 2018-09-22) the `WORKING_DIRECTORY` option accepts generator expressions. Fix support for the case of a leading generator expression by deferring conversion to an absolute path until after evaluation of the generator expression. Fixes: #18543
* | | | | CMake Nightly Date StampKitware Robot2018-11-051-1/+1
| | | | |
* | | | | Merge branch 'release-3.13'Craig Scott2018-11-050-0/+0
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge branch 'cpack-gen-docs-link' into release-3.13Craig Scott2018-11-051-2/+3
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !2562
* | \ \ \ \ Merge topic 'cpack-gen-docs-link'Craig Scott2018-11-051-2/+3
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | c12eefa8fd Help: Fix generators link in cpack(1) manual Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2562
| * | | | | Help: Fix generators link in cpack(1) manualCraig Scott2018-11-031-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Minor rewording around the updated link and extra blank line added to improve readability and remove a potential ambiguity around the same area. Fixes: #18545
* | | | | | CMake Nightly Date StampKitware Robot2018-11-041-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2018-11-031-1/+1
| | | | | |
* | | | | | Merge branch 'release-3.12'Brad King2018-11-020-0/+0
|\ \ \ \ \ \
| * | | | | | CMake 3.12.4v3.12.4Brad King2018-11-021-1/+1
| | | | | | |
* | | | | | | Merge topic 'FindGDAL-target'Brad King2018-11-026-11/+91
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 22ba9b6a32 FindGDAL: set the GDAL_VERSION 525ff0c3bc Tests/FindGDAL: add a test for FindGDAL 87324b9b6a FindGDAL: add an imported target dfb3f58f79 FindGDAL: Modernize documentation layout Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2552
| * | | | | | | FindGDAL: set the GDAL_VERSIONBen Boeckel2018-11-013-7/+17
| | | | | | | |
| * | | | | | | Tests/FindGDAL: add a test for FindGDALBen Boeckel2018-11-014-0/+44
| | | | | | | |
| * | | | | | | FindGDAL: add an imported targetBen Boeckel2018-11-012-0/+17
| | | | | | | |
| * | | | | | | FindGDAL: Modernize documentation layoutBrad King2018-11-011-12/+21
| | | | | | | |
* | | | | | | | Merge topic 'msvc-custom-rc-mt'Brad King2018-11-0210-25/+66
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bd9bfc6449 MSVC: Respect CMAKE_RC_COMPILER and CMAKE_MT in vs_link_{dll,exe} 0033676796 CUDA: Enable RC language on Windows 02f566a559 MSVC: Factor out enable_language(RC) call into helper macro b601bb6f1c CUDA: Find CMAKE_LINKER on Windows 3eebe28ef4 cmLocalNinjaGenerator: Simplify CreateRulePlaceholderExpander Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2424
| * | | | | | | | MSVC: Respect CMAKE_RC_COMPILER and CMAKE_MT in vs_link_{dll,exe}Mateusz Zych2018-10-299-22/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CMake commands vs_link_dll and vs_link_exe, performing linking on MSVC, are responsible for calling resource compiler and manifest tool. Before this commit, both of these tools were called directly, with the expectation that they are available in the `PATH`. This has been fixed by respecting CMake variables `CMAKE_RC_COMPILER` and `CMAKE_MT` defining paths to these tools. Fixes: #17804
| * | | | | | | | CUDA: Enable RC language on WindowsBrad King2018-10-291-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need the resource compiler to place manifests in binaries. Make sure it is available.
| * | | | | | | | MSVC: Factor out enable_language(RC) call into helper macroBrad King2018-10-291-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will be useful to call from elsewhere later.
| * | | | | | | | CUDA: Find CMAKE_LINKER on WindowsBrad King2018-10-292-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We use this in `Modules/Platform/Windows-NVIDIA-CUDA.cmake`, so make sure it is available.
| * | | | | | | | cmLocalNinjaGenerator: Simplify CreateRulePlaceholderExpanderMateusz Zych2018-10-261-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Re-use the derived class implementation instead of duplicating it.
* | | | | | | | | Merge topic 'check-keywords-only-if-used'Brad King2018-11-0223-10/+103
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4babc9058a cmTargetPropCommandBase: check keywords after parsing 45a49ae58a cmTargetPropCommandBase: simplify code path 9f64974f5e cmTargetPropCommandBase: skip property setting if there's nothing to add 4201a11c2b Tests: add tests for empty-value keyword arguments in target_* Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2514
| * | | | | | | | | cmTargetPropCommandBase: check keywords after parsingBen Boeckel2018-10-2615-49/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The following was disallowed: add_library(iface INTERFACE) target_link_libraries(iface PUBLIC) just due to the mention of the `PUBLIC` keyword. Instead, only error if there are actually `PUBLIC` dependencies specified (and analogously for other restrictions). Update tests to expect this new behavior.
| * | | | | | | | | cmTargetPropCommandBase: simplify code pathBen Boeckel2018-10-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The outside of the loop does the same return expression.
| * | | | | | | | | cmTargetPropCommandBase: skip property setting if there's nothing to addBen Boeckel2018-10-261-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some target types don't allow setting certain properties even if there is no value being set there. Guard against this by avoiding property setting when there is nothing to add.