summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* graphviz: dereference ALIAS targetsNick Schultz2018-10-263-8/+31
| | | | | | | Previous behavior treats ALIAS targets as external targets. This fix de-aliases these targets to their pointed target. Fixes: #15636
* Merge branch 'release-3.13'Brad King2018-10-240-0/+0
|\
| * Merge branch 'vs-csharp-win32-flags' into release-3.13Brad King2018-10-235-10/+10
| |\ | | | | | | | | | Merge-request: !2516
| * \ Merge branch 'vs-csharp-in-custom-target' into release-3.13Brad King2018-10-234-0/+7
| |\ \ | | | | | | | | | | | | Merge-request: !2515
* | \ \ Merge topic 'vs-csharp-win32-flags'Brad King2018-10-245-10/+10
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | 8e56e8b283 VS: Fix CSharp support for win32res: and win32icon: flags Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2516
| * | | VS: Fix CSharp support for win32res: and win32icon: flagsBrad King2018-10-235-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a missing `:` to these entries in the flag table. The user value is always required and must come after the `:`. Fixes: #18486
* | | | Merge topic 'vs-csharp-in-custom-target'Brad King2018-10-244-0/+7
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | d004d8c59a VS: Fix crash on CSharp sources in a custom target Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2515
| * | | VS: Fix crash on CSharp sources in a custom targetBrad King2018-10-234-0/+7
| |/ / | | | | | | | | | | | | | | | | | | The target generator does not compute ClOptions for custom targets, so we should not use them either. Fixes: #18377, #18485
* | | Merge topic 'scripting-commands'Brad King2018-10-2441-319/+472
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | c2efb3efcd Help: Revise docs on Scripting Commands Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2504
| * | | Help: Revise docs on Scripting CommandsJoachim Wuttke (l)2018-10-2341-319/+472
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revise docs for all "Scripting Commands", except four find_XXX that use a macro suite of their own. * Take full advantage of the improved syntax highlighting. * Make consequential use of <..> placeholders. * Clarify things here and there in the text. Specific improvements to some command docs: * "math": Correct description of novel hexadecimal capability. * "if", "foreach", "while": Provide link to "endif" etc * "foreach", "while": Mention "break" and "continue". * "foreach": Simplify explanation of ``RANGE`` and ``IN`` signatures; advise against negative arguments or reverse ranges (compare issue #18461) * "endif", "endfunction" etc: Explain that the argument is optional and maintained for compatibility only
* | | | CMake Nightly Date StampKitware Robot2018-10-241-1/+1
| | | |
* | | | Merge topic 'rst-block-comments'Brad King2018-10-23202-9868/+10078
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 75f73dde0f Utilities/Scripts: Remove temporary block-style comment conversion script df4ed1e9ff Help: Convert remaining modules to block-style comments 7115aa6c22 Utilities/Scripts: Add temporary block-style comment conversion script Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2510
| * | | | Utilities/Scripts: Remove temporary block-style comment conversion scriptKyle Edwards2018-10-221-33/+0
| | | | |
| * | | | Help: Convert remaining modules to block-style commentsKitware Robot2018-10-22202-9868/+10078
| | | | |
| * | | | Utilities/Scripts: Add temporary block-style comment conversion scriptKyle Edwards2018-10-221-0/+33
| | | | |
* | | | | Merge branch 'release-3.13'Brad King2018-10-230-0/+0
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge branch 'GNUInstallDirs-kfreebsd-man' into release-3.13Brad King2018-10-222-2/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !2511
| * \ \ \ \ Merge branch 'update-curl' into release-3.13Brad King2018-10-22114-1859/+2568
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !2509
| * \ \ \ \ \ Merge branch 'curl-ssize_t' into release-3.13Brad King2018-10-221-0/+6
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !2513
* | \ \ \ \ \ \ Merge topic 'GNUInstallDirs-kfreebsd-man'Brad King2018-10-232-2/+2
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b2d7ab8bd1 GNUInstallDirs: Don't use BSD info and man paths on GNU/kFreeBSD Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2511
| * | | | | | | GNUInstallDirs: Don't use BSD info and man paths on GNU/kFreeBSDJames Clarke2018-10-222-2/+2
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge topic 'update-curl'Brad King2018-10-23114-1859/+2568
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0310024563 curl: Update build within CMake to account for 7.61 changes b9d1107790 curl: Backport to work with CMake 3.1 again e9e8dcee6b Merge branch 'upstream-curl' into update-curl 18812a9c3d curl 2018-09-04 (432eb5f5) ded211ae46 curl: Update script to get curl 7.61.1 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2509
| * | | | | | curl: Update build within CMake to account for 7.61 changesBrad King2018-10-222-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The_CURL_STATICLIB option was replaced by BUILD_SHARED_LIBS. Drop our own CURL_STATICLIB compile definition because it is now provided by curl's usage requirements.
| * | | | | | curl: Backport to work with CMake 3.1 againBrad King2018-10-221-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Curl 7.61.1 requires CMake 3.4 to build from source and also exposes a dependency on OpenSSL imported targets. Revert that part of the changes imported from curl upstream.
| * | | | | | Merge branch 'upstream-curl' into update-curlBrad King2018-10-22112-1858/+2567
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream-curl: curl 2018-09-04 (432eb5f5)
| | * | | | | | curl 2018-09-04 (432eb5f5)Curl Upstream2018-10-22112-1865/+2573
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://github.com/curl/curl.git at commit 432eb5f5c254ee8383b2522ce597c9219877923e (curl-7_61_1).
| * | | | | | | curl: Update script to get curl 7.61.1Brad King2018-10-221-1/+1
| | |/ / / / / | |/| | | | |
* | | | | | | Merge topic 'curl-ssize_t'Brad King2018-10-231-0/+6
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3dc484e531 curl: add missing type sizes for 'long long' and '__int64' Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2513
| * | | | | | curl: add missing type sizes for 'long long' and '__int64'Brad King2018-10-221-0/+6
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When generating `curl_config.h`, add size information for `long long` and `__int64` types. These are needed as candidates for defining the `ssize_t` type because on MSVC, `long` is not the same size as `size_t`. This problem did not affect upstream curl because it computes the `ssize_t` type in CMake code where all sizes are available. CMake's port computes it in preprocessor logic because universal binaries on macOS do not know type sizes until compile time. Fixes: #18477
* | | | | | CMake Nightly Date StampKitware Robot2018-10-231-1/+1
| | | | | |
* | | | | | Merge branch 'release-3.13'Brad King2018-10-220-0/+0
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge branch 'update-kwsys' into release-3.13Brad King2018-10-192-1/+6
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !2506
* | \ \ \ \ \ Merge topic 'backtrace-gen-values'Brad King2018-10-227-153/+377
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dd4f8b2a48 install: Record TARGET mode backtraces internally 753ab3c978 Add generator APIs to get build settings with backtraces 52311484dd cmLocalGenerator: Make MoveSystemIncludesToEnd file-local Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2502
| * | | | | | | install: Record TARGET mode backtraces internallyBrad King2018-10-183-33/+43
| | | | | | | |
| * | | | | | | Add generator APIs to get build settings with backtracesBrad King2018-10-184-112/+329
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In cmGeneratorTarget and cmLocalGenerator we offer several APIs to get build settings like include directories, compile definitions, source files, etc. Add corresponding APIs that include backtrace information.
| * | | | | | | cmLocalGenerator: Make MoveSystemIncludesToEnd file-localBrad King2018-10-182-9/+6
| | | | | | | |
* | | | | | | | Merge topic 'ExternalProject-log-options'Brad King2018-10-224-10/+56
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7ddc9e353b ExternalProject: option LOG_MERGED_STDOUTERR to combine stdout and stderr b6f6cac378 ExternalProject: add LOG_DIR option that allows overriding of log location Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2488
| * | | | | | | | ExternalProject: option LOG_MERGED_STDOUTERR to combine stdout and stderrWouter Klouwen2018-10-194-3/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In some circumstances the user of ExternalProject may not desire the split log files for stdout and stderr. In particular with a project has many errors it can be difficult to correlate the output error with the command that it resulted from. This commit adds the LOG_MERGED_STDOUTERR option that when enabled outputs into a unified <name>-<step>.log for each step. If disabled it will default to the previous behaviour of <name>-<step>-out.log and <name>-<step>-err.log.
| * | | | | | | | ExternalProject: add LOG_DIR option that allows overriding of log locationWouter Klouwen2018-10-193-7/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In some situations it can be helpful to separate out the location of the log files from the location of the stamp files. For instance if you have a continuous integration that exposes the location where log files are stored. This commit adds an option that allows a user to override the default behaviour of putting the log files in STAMP_DIR called LOG_DIR. The previous behaviour of putting the log files into the STAMP_DIR applies if LOG_DIR is not specified.
* | | | | | | | | Merge topic 'update-kwsys'Brad King2018-10-222-1/+6
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | / / | |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a833c24ceb Merge branch 'upstream-KWSys' into update-kwsys 43cb257648 KWSys 2018-10-19 (c2f29d2e) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2506
| * | | | | | | Merge branch 'upstream-KWSys' into update-kwsysBrad King2018-10-192-1/+6
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | * upstream-KWSys: KWSys 2018-10-19 (c2f29d2e)
| | * | | | | | KWSys 2018-10-19 (c2f29d2e)KWSys Upstream2018-10-192-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://gitlab.kitware.com/utils/kwsys.git at commit c2f29d2e929e58e36b4986d3ff5364a0d825cfca (master). Upstream Shortlog ----------------- Ben Boeckel (1): a5caf8a4 cmake: support an alias target Modestas Vainius (1): 162b3ed7 SystemInformation: Fix compilation on GNU/{kFreeBSD,Hurd}
* | | | | | | | CMake Nightly Date StampKitware Robot2018-10-221-1/+1
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2018-10-211-1/+1
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2018-10-201-1/+1
| |_|/ / / / / |/| | | | | |
* | | | | | | Merge branch 'release-3.13'Brad King2018-10-190-0/+0
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Merge branch 'deployqt4-cmp0080-fix' into release-3.13Brad King2018-10-192-368/+384
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !2494
* | \ \ \ \ \ \ Merge topic 'deployqt4-cmp0080-fix'Brad King2018-10-193-365/+382
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 31b6825bd2 Merge branch 'master' into deployqt4-cmp0080-fix 15bbff0581 DeployQt4: Do not include BundleUtilities at configure time 65bea5b90b DeployQt4: Convert to 2-space indentation 9bfb63bd42 Help: Convert DeployQt4 to block-style comment Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2494
| * \ \ \ \ \ \ \ Merge branch 'master' into deployqt4-cmp0080-fixKyle Edwards2018-10-19229-699/+1387
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | DeployQt4: Do not include BundleUtilities at configure timeKyle Edwards2018-10-192-71/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to CMP0080, BundleUtilities can no longer be included at configure-time. However, DeployQt4 contains some functions which are meant to be used at configure-time, and some which are meant to be used at install-time and use BundleUtilities. This change breaks the file into two sections: common functions and install-time functions. BundleUtilities is now only included at install-time, thus fixing the policy warning. Fixes: #18466
generated by cgit v0.12 at 2025-01-25 09:20:17 (GMT)