summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Tests: Add cases for -{C,D,U} without a source treeBrad King2018-10-2612-1/+22
|
* cmake: distinguish '-Cpath' from '-C path' in source dir parsingPaul Seyfert2018-10-261-0/+15
| | | | | | | | | | | | | This results in the correct source directory being picked up in calls with cmake sourcedir -C settings and in a more appropriate error message when calling mkdir build ; cd build ; cmake -C settings Also fix `-D` and `-U` in the same way.
* 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
| * | | | | | DeployQt4: Convert to 2-space indentationKyle Edwards2018-10-181-259/+259
| | | | | | |
| * | | | | | Help: Convert DeployQt4 to block-style commentKyle Edwards2018-10-181-100/+101
| | | | | | |
* | | | | | | Merge topic 'target-depend-backtraces'Brad King2018-10-1921-106/+173
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dacbb41455 Track backtraces in target dependencies internally a6e02f881d add_dependencies: Track backtraces internally a093b1a4f3 cmLinkItem: Add backtrace e022e2d873 cmListFileCache: Add ExpandListWithBacktrace helper f1dd0eeaaf cmListFileCache: Add wrapper template for values with a backtrace Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2498
| * | | | | | Track backtraces in target dependencies internallyBrad King2018-10-186-19/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Carry backtraces on target dependency edges to refer to the line in project code that caused the edge to appear.
| * | | | | | add_dependencies: Track backtraces internallyBrad King2018-10-1811-54/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Record backtraces for "utility" dependencies created by `add_dependencies` calls.
| * | | | | | cmLinkItem: Add backtraceBrad King2018-10-186-37/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Carry a backtrace on every link item, not just link implementation items. For now the non-impl items will still have empty backtraces at runtime, but this will allow us to introduce values over time.
| * | | | | | cmListFileCache: Add ExpandListWithBacktrace helperBrad King2018-10-172-0/+16
| | | | | | |
| * | | | | | cmListFileCache: Add wrapper template for values with a backtraceBrad King2018-10-172-1/+35
| | | | | | |
* | | | | | | Merge topic 'find_fontconfig'Brad King2018-10-199-0/+157
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 84e7920b3a FindFontconfig: Add module to find Fontconfig Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2487
| * | | | | | | FindFontconfig: Add module to find FontconfigFrederik Gladhorn2018-10-189-0/+157
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This module is inspired by one from KDE's KWin.
* | | | | | | | Merge topic 'cmake-through-3.12'Brad King2018-10-193-3/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 95b4b9137a Declare support for CMake versions through 3.12 for own build Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2496
| * | | | | | | | Declare support for CMake versions through 3.12 for own buildBrad King2018-10-173-3/+3
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CMake 3.12 introduced a `...<max>` syntax in the version given to `cmake_minimum_required` to automatically set policies to NEW up to that version. Use it to avoid listing policies explicitly. The syntax is compatible with older versions of CMake such that they use the extended version string for the `CMAKE_MINIMUM_REQUIRED_VERSION` variable (which we don't use) but otherwise ignore it.
* | | | | | | | Merge topic 'FindLibinput-no-version-string-var'Brad King2018-10-191-1/+0
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c88fb94978 FindLibinput: do not set Libinput_VERSION_STRING Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2501
| * | | | | | | | FindLibinput: do not set Libinput_VERSION_STRINGFrederik Gladhorn2018-10-181-1/+0
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | Libinput_VERSION is enough, this is redundant
* | | | | | | | Merge branch 'release-3.13'Brad King2018-10-190-0/+0
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | Merge branch 'doc-target_link_libraries-item-quoting' into release-3.13Brad King2018-10-181-0/+12
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | | | | | | | | Merge-request: !2503
* | | | | | | | Merge topic 'doc-target_link_libraries-item-quoting'Brad King2018-10-191-0/+12
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 18cff26e3a Help: Clarify command-line encoding of target_link_libraries items Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2503
| * | | | | | | Help: Clarify command-line encoding of target_link_libraries itemsBrad King2018-10-181-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Items that have full paths will be quoted automatically. Other items are treated as command-line string fragments and get no automatic escaping. Document the behavior for each item kind. Fixes: #18467
* | | | | | | | Merge topic 'help-syntax-highlighting'Craig Scott2018-10-1922-175/+294
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 93f3f65516 Help: Revise docs of modules AddFileDependencies..CheckFunctionExists fc7ee1ca45 Help: Override pygments CMakeLexer to support <..> and [..] 74b3eacdc7 Help: Use appropriate list types in FindPkgConfig Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2468
| * | | | | | | | Help: Revise docs of modules AddFileDependencies..CheckFunctionExistsJoachim Wuttke (l)2018-10-1814-114/+126
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Replace '::' by '.. code-block:: cmake' wherever it makes sense. * Convert to definition list where appropriate. * Prefer '<placeholder>' over 'placeholder'.
| * | | | | | | | Help: Override pygments CMakeLexer to support <..> and [..]Joachim Wuttke (o)2018-10-188-35/+127
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * The code snippets in the docs consist of CMake code mixed with syntax definition punctuation like < > [ ] ... Therefore a pure CMake lexer is inadequate. Here it is replaced by a CMake syntax definition parser. * Fixed syntax definition snippets in FindPkgConfig.cmake to make best use of syntax highlighting. This source file is the hardest to support because it contains comparison operators <= = >=, which need special attention to avoid confusion with the placeholder indicators <...>. * Fixed syntax in execute_process.rst (there were unbalanced brackets). * Disabled syntax highlighting for long string examples in cmake-language.7.rst. * No highlighting of removed syntax in CMP0049 * To inspect the outcome of this patch, see e.g. the pages * manual/cmake-buildsystem.7.html * module/ExternalProject.html * module/FindPkgConfig.html which are particularly rich in complex code snippets.
| * | | | | | | | Help: Use appropriate list types in FindPkgConfigJoachim Wuttke (l)2018-10-171-27/+42
| | | | | | | | |
* | | | | | | | | CMake Nightly Date StampKitware Robot2018-10-191-1/+1
| |_|_|/ / / / / |/| | | | | | |
* | | | | | | | Merge branch 'release-3.13'Brad King2018-10-180-0/+0
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | Merge branch 'update-vim-syntax' into release-3.13Brad King2018-10-182-106/+2148
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !2500
* | \ \ \ \ \ \ \ Merge topic 'update-vim-syntax'Brad King2018-10-182-106/+2148
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3aa258db0e Merge branch 'upstream-vim-cmake-syntax' into update-vim-syntax c9493939ea vim-cmake-syntax 2018-10-18 (64ff4bd7) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2500
| * | | | | | | | Merge branch 'upstream-vim-cmake-syntax' into update-vim-syntaxBrad King2018-10-182-106/+2148
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream-vim-cmake-syntax: vim-cmake-syntax 2018-10-18 (64ff4bd7)
generated by cgit v0.12 at 2025-01-12 19:05:51 (GMT)