Commit Graph
47352 Commits
Author SHA1 Message Date
Brad King d120ccd193 Merge topic 'find_fontconfig'
84e7920b3a FindFontconfig: Add module to find Fontconfig

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2487
2018-10-19 09:59:27 -04:00
Brad King 29ec12fb4f Merge topic 'cmake-through-3.12'
95b4b9137a Declare support for CMake versions through 3.12 for own build

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2496
2018-10-19 09:58:27 -04:00
Brad King 8c40cd6ea6 Merge topic 'FindLibinput-no-version-string-var'
c88fb94978 FindLibinput: do not set Libinput_VERSION_STRING

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2501
2018-10-19 09:57:04 -04:00
Kyle Edwards 15bbff0581 DeployQt4: Do not include BundleUtilities at configure time
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
2018-10-19 09:54:10 -04:00
Brad King 1fd8040f26 Merge branch 'release-3.13' 2018-10-19 09:53:44 -04:00
Brad King b142956829 Merge topic 'doc-target_link_libraries-item-quoting'
18cff26e3a Help: Clarify command-line encoding of target_link_libraries items

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2503
2018-10-19 09:47:53 -04:00
Craig Scott 7053dd301c Merge topic 'help-syntax-highlighting'
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
2018-10-19 06:31:55 -04:00
Kitware Robot 250b8c1662 CMake Nightly Date Stamp 2018-10-19 00:01:08 -04:00
Joachim Wuttke (l) 93f3f65516 Help: Revise docs of modules AddFileDependencies..CheckFunctionExists
* Replace '::' by '.. code-block:: cmake' wherever it makes sense.
* Convert to definition list where appropriate.
* Prefer '<placeholder>' over 'placeholder'.
2018-10-19 07:27:31 +11:00
Joachim Wuttke (o) fc7ee1ca45 Help: Override pygments CMakeLexer to support <..> and [..]
* 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.
2018-10-19 07:25:34 +11:00
Frederik Gladhorn 84e7920b3a FindFontconfig: Add module to find Fontconfig
This module is inspired by one from KDE's KWin.
2018-10-18 20:32:09 +02:00
Frederik Gladhorn c88fb94978 FindLibinput: do not set Libinput_VERSION_STRING
Libinput_VERSION is enough, this is redundant
2018-10-18 20:30:32 +02:00
Brad King f3719a790c Merge branch 'doc-target_link_libraries-item-quoting' into release-3.13
Merge-request: !2503
2018-10-18 13:33:29 -04:00
Brad King 18cff26e3a Help: Clarify command-line encoding of target_link_libraries items
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
2018-10-18 13:31:24 -04:00
Brad King dd4f8b2a48 install: Record TARGET mode backtraces internally 2018-10-18 12:46:48 -04:00
Kyle Edwards 65bea5b90b DeployQt4: Convert to 2-space indentation 2018-10-18 12:03:14 -04:00
Kyle Edwards 9bfb63bd42 Help: Convert DeployQt4 to block-style comment 2018-10-18 12:03:14 -04:00
Brad King 753ab3c978 Add generator APIs to get build settings with backtraces
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.
2018-10-18 08:26:27 -04:00
Brad King 52311484dd cmLocalGenerator: Make MoveSystemIncludesToEnd file-local 2018-10-18 08:26:27 -04:00
Brad King dacbb41455 Track backtraces in target dependencies internally
Carry backtraces on target dependency edges to refer to the line in
project code that caused the edge to appear.
2018-10-18 08:11:19 -04:00
Brad King a6e02f881d add_dependencies: Track backtraces internally
Record backtraces for "utility" dependencies created by
`add_dependencies` calls.
2018-10-18 08:10:55 -04:00
Brad King a093b1a4f3 cmLinkItem: Add backtrace
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.
2018-10-18 08:07:46 -04:00
Brad King 1771ec85b6 Merge branch 'release-3.13' 2018-10-18 07:58:05 -04:00
Brad King 071588414a Merge topic 'update-vim-syntax'
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
2018-10-18 07:56:30 -04:00
Brad King 09daee0780 Merge branch 'update-vim-syntax' into release-3.13
Merge-request: !2500
2018-10-18 07:55:26 -04:00
Brad King 3aa258db0e Merge branch 'upstream-vim-cmake-syntax' into update-vim-syntax
* upstream-vim-cmake-syntax:
  vim-cmake-syntax 2018-10-18 (64ff4bd7)
2018-10-18 07:53:55 -04:00
vim-cmake-syntax upstream c9493939ea vim-cmake-syntax 2018-10-18 (64ff4bd7)
Code extracted from:

    https://github.com/pboettch/vim-cmake-syntax.git

at commit 64ff4bd793c247da5a1772fffad91378dddf03b9 (master).

Upstream Shortlog
-----------------

Patrick Boettcher (1):
      64ff4bd7 break line after each high-lighting keyword
2018-10-18 07:52:33 -04:00
Brad King cb5015fb9f Merge branch 'release-3.13' 2018-10-18 07:39:32 -04:00
Brad King 2646fd8e03 Merge branch 'rel-doc-qthelp' into release-3.13
Merge-request: !2497
2018-10-18 07:39:07 -04:00
Brad King fc675057e4 Merge branch 'revert-server-iface-sources' into release-3.13
Merge-request: !2495
2018-10-18 07:38:57 -04:00
Brad King 56c85d9429 Merge topic 'rel-doc-qthelp'
1d5c8b81db Utilities/Release: Add qthelp docs to binary archives

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2497
2018-10-18 07:38:15 -04:00
Brad King 5b47557c82 Merge topic 'revert-server-iface-sources'
284a38e42f cmake-server: Revert "Support codemodel filegroups for INTERFACE_SOURCES"

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2495
2018-10-18 07:31:18 -04:00
Kitware Robot aab69ccd9b CMake Nightly Date Stamp 2018-10-18 00:01:07 -04:00
Brad King 1d5c8b81db Utilities/Release: Add qthelp docs to binary archives
Fixes: #18465
2018-10-17 14:38:46 -04:00
Brad King 95b4b9137a Declare support for CMake versions through 3.12 for own build
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.
2018-10-17 14:29:16 -04:00
Brad King e022e2d873 cmListFileCache: Add ExpandListWithBacktrace helper 2018-10-17 14:20:34 -04:00
Brad King f1dd0eeaaf cmListFileCache: Add wrapper template for values with a backtrace 2018-10-17 14:20:34 -04:00
Brad King 4fc8e8b023 Merge topic 'improve-readme'
33632898e9 README: Suggest "sudo" for "make install"

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2493
2018-10-17 14:11:18 -04:00
David Demelier 33632898e9 README: Suggest "sudo" for "make install" 2018-10-17 14:09:51 -04:00
Brad King 284a38e42f cmake-server: Revert "Support codemodel filegroups for INTERFACE_SOURCES"
Revert commit v3.13.0-rc1~144^2 (cmake-server: Support codemodel
filegroups for INTERFACE_SOURCES, 2018-08-10).  The changes activate
code paths not meant to be used with interface libraries.  Another
approach will be needed to expose this information later.

This revert has to be done by hand because the code in question has been
changed somewhat since the changes were made, and was also factored out
to another source file.

Fixes: #18463
2018-10-17 14:02:39 -04:00
Brad King 78681bf001 Merge topic 'better-empty-list-behavior'
121a036f73 cmListCommand: handle empty lists for list(REMOVE_AT)
acfe53c588 cmListCommand: make list(ACTION not_a_list) succeed when idempotent
bf572ac952 cmListCommand: check list(FILTER) operation before the list

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2478
2018-10-17 13:27:56 -04:00
Brad King f21d811c7c Merge topic 'gem-string'
b8bb6ba653 cmGeneratorTarget::GetExportMacro: return const std::string*

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2485
2018-10-17 13:26:33 -04:00
Brad King cd4ed3ecb2 Merge topic 'ctor-remove'
d543eb2260 cmCustomCommand: remove the default constructor

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Brad King <brad.king@kitware.com>
Merge-request: !2486
2018-10-17 13:24:27 -04:00
Brad King 004d9ebbd3 Merge topic 'vs-improve'
1601388212 cmVisualStudio10TargetGenerator: Code improvement

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2484
2018-10-17 13:23:50 -04:00
Brad King b82b8705b2 Merge topic 'FindLibinput-compile-options'
0c20d4d67b FindLibinput: Use _COMPILE_OPTIONS instead of _DEFINITIONS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2490
2018-10-17 13:22:49 -04:00
Brad King 275290375d Merge topic 'ctest-coverage-gtm-percent'
f7d92deff4 CTest: Fix GTM coverage handling of entry point named "%"

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2489
2018-10-17 13:22:04 -04:00
Joachim Wuttke (l) 74b3eacdc7 Help: Use appropriate list types in FindPkgConfig 2018-10-17 23:50:22 +11:00
Kitware Robot 88ef5737a2 CMake Nightly Date Stamp 2018-10-17 00:01:08 -04:00
Ben Boeckel 121a036f73 cmListCommand: handle empty lists for list(REMOVE_AT)
Treat an empty list as a list with no valid bounds and return an error
message indicating that any given indices are out-of-bounds.
2018-10-16 14:31:39 -04:00
Ben Boeckel acfe53c588 cmListCommand: make list(ACTION not_a_list) succeed when idempotent
The operations changed here all are no-ops on empty lists anyways, so
just have them succeed when given non-extant lists.

  - `list(REMOVE_ITEM)`
  - `list(REMOVE_DUPLICATES)`
  - `list(SORT)`
  - `list(FILTER)`
  - `list(REVERSE)`
2018-10-16 14:31:39 -04:00