mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-18 13:10:17 -06:00
Code Issues Packages Projects Releases Wiki Activity
39,584 Commits 2 Branches 390 Tags
7a33cfc1bce0a4946da166327515557b48d3a2ea
Commit Graph

39584 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Franke
7a33cfc1bc regenerate-parsers.bash: Add script to automate parser generation 
This depends on

- a suitable flex version in PATH (currently 3.0.4)
- a suitable version of 'sed' in PATH (e.g. GNU sed)
 2018-05-16 11:47:44 -04:00
Daniel Franke
3d382a494f regenerate-lexers.bash: Add option to check timestamps 2018-05-16 11:47:41 -04:00
Daniel Franke
5cd9f5c965 regenerate-lexers.bash: Factor file names into variables 2018-05-16 11:47:37 -04:00
Kitware Robot
547df3a385 CMake Nightly Date Stamp 2018-05-09 00:01:05 -04:00
Brad King
d15b491449 Merge branch 'release-3.11' 2018-05-08 08:39:32 -04:00
Brad King
0df2e30638 Merge branch 'FindCUDA-revert-sepcomp-cublas' into release-3.11 
Merge-request: !2048
 2018-05-08 08:38:46 -04:00
Brad King
c400cd4f3a Merge branch 'doc-updates' into release-3.11 
Merge-request: !2043
 2018-05-08 08:38:34 -04:00
Brad King
6a95a097d9 Merge branch 'java-new-packaging-fixes' into release-3.11 
Merge-request: !2042
 2018-05-08 08:38:25 -04:00
Brad King
e16a04ce2e Merge topic 'pkgconf-imp-target-lib-path' 
ac5731a7e3 FindPkgConfig: correct library search path for imported targets.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2027
 2018-05-08 08:37:35 -04:00
Brad King
f60e2eb3c5 Merge topic 'vs-improve-options' 
e76a0c6071 VS: improve options generation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2044
 2018-05-08 08:36:57 -04:00
Brad King
42d198744b Merge topic 'deprecate_static_managed_targets' 
b7c2b2cd78 cmVisualStudio10TargetGenerator: add handling of static C# targets
d244f2cad3 cmVisualStudio10TargetGenerator: add handling of manual /clr setting
1e5a8f882f cmVisualStudio10TargetGenerator: fix checking for managed target
8d7ffed048 cmVisualStudio10TargetGenerator: issue warning when adding static C# lib
73ee599a82 cmGeneratorTarget: make GetManagedType() return 'Native' for static targets

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2014
 2018-05-08 08:36:20 -04:00
Brad King
65431c727b Merge topic 'update-libuv' 
0d389d175a libuv: Revert local linux/sparc64 fix now that we have upstream fix
42fbb28516 Merge branch 'upstream-libuv' into update-libuv
c8b67ea119 libuv 2018-05-06 (bf605bd7)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2049
 2018-05-08 08:34:51 -04:00
Brad King
d165fd1727 Merge topic 'doc-code-block-highlight' 
8114b00b02 Utilities/Sphinx: Do not highlight unspecified code blocks as python

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2047
 2018-05-08 08:28:19 -04:00
Brad King
6ab7267d2a Merge topic 'FindCUDA-revert-sepcomp-cublas' 
9a66345752 FindCUDA: Fix regression in separable compilation without cublas

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2048
 2018-05-08 08:26:46 -04:00
Brad King
f1344ca2ad Merge topic 'doc-updates' 
e15adbfed3 Help: Specify COMPILE_OPTIONS and COMPILE_FLAGS source properties usage

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2043
 2018-05-08 08:21:27 -04:00
Brad King
14bfd267e5 Merge topic 'java-new-packaging-fixes' 
b4e1569315 FindJava, FindJNI: fix erroneous regex, enhance registry lookup

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2042
 2018-05-08 08:20:36 -04:00
Kitware Robot
c0fa21322c CMake Nightly Date Stamp 2018-05-08 00:01:04 -04:00
Brad King
0d389d175a libuv: Revert local linux/sparc64 fix now that we have upstream fix 2018-05-07 11:49:25 -04:00
Brad King
42fbb28516 Merge branch 'upstream-libuv' into update-libuv 
* upstream-libuv:
  libuv 2018-05-06 (bf605bd7)
 2018-05-07 11:48:01 -04:00
libuv upstream
c8b67ea119 libuv 2018-05-06 (bf605bd7) 
Code extracted from:

    https://github.com/libuv/libuv.git

at commit bf605bd7d0dd5660663e8e2eb44d63aa3355e268 (v1.x).
 2018-05-07 11:47:58 -04:00
Brad King
9a66345752 FindCUDA: Fix regression in separable compilation without cublas 
Revert commit v3.11.0-rc1~274^2 (FindCUDA: Add cublas device library to
separable compilation, 2017-11-03).  It breaks targets that do not link
to cublas.  Another solution will be needed to solve the original
problem in a more compatible way.

Fixes: #17965
 2018-05-07 11:30:21 -04:00
Brad King
dd3e1a7372 Merge topic 'doc-command-synopsis' 
72814e46da Utilities/Sphinx: Make HTML links in parsed-literal blocks more obvious
08b4ea639c Help: Organize file command docs into sections
51c0e1407c Help: Add Synopsis section to install, list, and string docs
0acd705119 Help: Improve list command signature group name for read operations
d5b2745b34 Help: Re-order file command docs
7d918b3cee cmRST: Parse inline links and inline literals

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2039
 2018-05-07 10:12:05 -04:00
Brad King
72814e46da Utilities/Sphinx: Make HTML links in parsed-literal blocks more obvious 
Hyperlink text color does not stand out when used inside a literal block
because such blocks typically get syntax highlighting.  Update our CSS
style to make the links more distinct.

Suggested-by: Kyle Edwards <kyle.edwards@kitware.com>
 2018-05-07 10:10:37 -04:00
Brad King
08b4ea639c Help: Organize file command docs into sections 
Add a synopsis section at the top summarizing all signatures.

Issue: #17948
 2018-05-07 10:10:37 -04:00
Brad King
51c0e1407c Help: Add Synopsis section to install, list, and string docs 
Summarize the command signatures in one block at the top of the
documentation as is typical in Unix command-line tool manuals.
Make the mode keywords links to the corresponding full signature
and documentation.

Issue: #17948
 2018-05-07 10:10:37 -04:00
Brad King
0acd705119 Help: Improve list command signature group name for read operations 
The LENGTH, GET, JOIN, and SUBLIST operations all read the list without
modifying it.  Name their section appropriately.
 2018-05-07 10:10:37 -04:00
Brad King
d5b2745b34 Help: Re-order file command docs 
Prepare for the addition of section headers for grouping commands.
 2018-05-07 10:10:37 -04:00
Brad King
7d918b3cee cmRST: Parse inline links and inline literals 
Render links as the link text only.  Render literals as themselves.
This is closer to what the Sphinx text generator does.
 2018-05-07 10:10:37 -04:00
Marc Chevrier
e15adbfed3 Help: Specify COMPILE_OPTIONS and COMPILE_FLAGS source properties usage 2018-05-07 09:45:23 -04:00
Marc Chevrier
b4e1569315 FindJava, FindJNI: fix erroneous regex, enhance registry lookup 2018-05-07 09:40:55 -04:00
Brad King
42db369133 Merge topic 'vs-cert' 
5cc195f1f4 VS Generator: Only include default certificate if it was actually copied

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2034
 2018-05-07 09:19:07 -04:00
Michael Stürmer
b7c2b2cd78 cmVisualStudio10TargetGenerator: add handling of static C# targets 2018-05-07 07:21:12 +02:00
Michael Stürmer
d244f2cad3 cmVisualStudio10TargetGenerator: add handling of manual /clr setting 2018-05-07 07:21:10 +02:00
Michael Stürmer
1e5a8f882f cmVisualStudio10TargetGenerator: fix checking for managed target 2018-05-07 07:21:08 +02:00
Michael Stürmer
8d7ffed048 cmVisualStudio10TargetGenerator: issue warning when adding static C# lib 2018-05-07 07:20:46 +02:00
Michael Stürmer
73ee599a82 cmGeneratorTarget: make GetManagedType() return 'Native' for static targets 2018-05-07 07:20:45 +02:00
Kitware Robot
7489d9cb24 CMake Nightly Date Stamp 2018-05-07 00:01:08 -04:00
Craig Scott
dfc6923428 Merge topic 'cpack_module_indentation_fix' 
a01c6e9921 CPack: Fix indentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2041
 2018-05-06 07:14:54 -04:00
Kitware Robot
c97189f9d1 CMake Nightly Date Stamp 2018-05-06 00:01:05 -04:00
Vitaly Stakhovsky
e76a0c6071 VS: improve options generation 
Make use of the `Elem` and `OptionsHelper` classes; some cleanup
 2018-05-05 17:35:37 -04:00
Kitware Robot
135825df20 CMake Nightly Date Stamp 2018-05-05 00:01:06 -04:00
Craig Scott
a01c6e9921 CPack: Fix indentation 
Addresses indentation not matching guidelines, missed in !2020.
No functional changes and no changes to docs.
 2018-05-05 09:48:25 +10:00
Brad King
8114b00b02 Utilities/Sphinx: Do not highlight unspecified code blocks as python 2018-05-04 14:57:36 -04:00
Mark Ingram
5cc195f1f4 VS Generator: Only include default certificate if it was actually copied 2018-05-04 18:10:10 +01:00
Brad King
e628d6cd06 Merge topic 'vs-refactor-xml' 
3f315dc128 cmVisualStudio10TargetGenerator: XML refactoring

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2028
 2018-05-04 11:26:36 -04:00
Brad King
5e5ef61ed3 Merge topic 'doc-xref-envvar' 
828e18bb3e cmRST: Add support for 'envvar' cmake domain role

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2038
 2018-05-04 11:04:53 -04:00
Vitaly Stakhovsky
3f315dc128 cmVisualStudio10TargetGenerator: XML refactoring 2018-05-04 10:46:11 -04:00
Brad King
fc35e817ee Merge topic 'test-CheckSourceTree-in-source' 
46fa1af514 Tests: Fix CheckSourceTree for in-source non-dashboard builds

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2025
 2018-05-04 09:37:14 -04:00
Brad King
efaaa729aa Merge topic 'genex-complang-not-loaded' 
4f82199bef Genex: Allow COMPILE_LANGUAGE to name a language that is not loaded

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2031
 2018-05-04 09:36:08 -04:00
Brad King
828e18bb3e cmRST: Add support for 'envvar' cmake domain role 
This was accidentally left out of commit 8acf46caf1 (Utilities/Sphinx:
Add role and directive for 'envvar' in CMake domain, 2018-04-19).
 2018-05-04 07:52:14 -04:00