37094 Commits

Author SHA1 Message Date
Yves Frederix
91935d9e54 FPHSA: lower-case for cmake_parse_arguments + move config-mode related code 2017-09-05 21:20:04 +02:00
Yves Frederix
aec27c152e FPHSA: use more localized _FOUND_VERSION instead of VERSION.
This fixes the failing unit tests in which a cache variable VERSION is present or the found version is 0.
2017-09-05 21:20:02 +02:00
Yves Frederix
0019bfebc9 FPHSA: Add (failing) unit test in case a cache variable VERSION is present 2017-09-05 21:20:00 +02:00
Yves Frederix
8184433428 FPHSA: add (failing) unit test for found version being equal to 0. 2017-09-05 21:18:34 +02:00
Kitware Robot
d75ccb1ce0 CMake Nightly Date Stamp 2017-09-01 00:01:08 -04:00
Brad King
9bad65940c Merge topic 'update-vim-syntax'
84d67356 Merge branch 'upstream-vim-cmake-syntax'
88da716c vim-cmake-syntax 2017-08-30 (40f5f4f3)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1214
2017-08-31 13:33:13 -04:00
Brad King
4f96641ba2 Merge topic 'cxx11-clang-format'
4022b286 clang-tidy: blacklist "modernize" checks
2b4c32c9 clang-format: format all code as Cpp11

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1191
2017-08-31 10:12:18 -04:00
Brad King
02d24c9ed2 Merge topic 'doc-xref-prefix-path'
952331cd Help: Cross-reference and clarify CMAKE_FIND_NO_INSTALL_PREFIX docs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Luke Yeager <luke.yeager@gmail.com>
Merge-request: !1213
2017-08-31 10:11:21 -04:00
Brad King
b40a43a1f4 Merge topic 'test-server-result'
ea359bc5 Tests: Teach Server test to print server return code

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1212
2017-08-31 10:11:04 -04:00
Brad King
425bb1a66a Merge topic 'irsl-intel'
fd4406f3 IRSL: Add Intel compiler support
8444252f IRSL: Install VC++ OpenMP libraries only for MSVC

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Pelle <pbregener@gmail.com>
Merge-request: !1121
2017-08-31 10:09:42 -04:00
Brad King
96c882dcba Merge topic 'lexer-null'
14d9a11b ListFileLexer: fix heap-buffer-overflow on malicious input

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1153
2017-08-31 10:08:18 -04:00
Kitware Robot
b4efc1936a CMake Nightly Date Stamp 2017-08-31 00:01:11 -04:00
Patrick Boettcher
84d6735611 Merge branch 'upstream-vim-cmake-syntax'
* upstream-vim-cmake-syntax:
  vim-cmake-syntax 2017-08-30 (40f5f4f3)
2017-08-30 22:40:38 +02:00
vim-cmake-syntax upstream
88da716c42 vim-cmake-syntax 2017-08-30 (40f5f4f3)
Code extracted from:

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

at commit 40f5f4f356251802c0a12f63e5f717debbd0cadc (master).

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

Daniel Hahler (1):
      84967b5c Skip escaped quotes in cmakeString

Patrick Boettcher (11):
      de7c9072 extract properties as well
      5e4f9718 update keywords to latest cmake-revision
      96ee5480 fix #1 - highlight escaped quotes in strings
      d791d3ac README updated, install instruction
      e12d6cb4 do not highlight cmake-commands in cmake-command argument-list
      d2d564aa multi-line comments are now highlighted (again)
      0e62850d update keywords to v3.9.1-460-gce2750817
      65932f07 add test-framework and two tests
      018855b2 add cpo-saving and restoring (taken from vim's upstream-syntax-files)
      8fcb0a7d updated keywords to 3.9.20170830-ge0713
      40f5f4f3 preparations to be for inclusion to vim-repo
2017-08-30 22:33:54 +02:00
Brad King
952331cded Help: Cross-reference and clarify CMAKE_FIND_NO_INSTALL_PREFIX docs
Suggested-by: Luke Yeager <lukeyeager@users.noreply.github.com>
2017-08-30 15:05:04 -04:00
Brad King
a0ef210da8 Merge branch 'release-3.9' 2017-08-30 14:45:50 -04:00
Brad King
ea359bc5a6 Tests: Teach Server test to print server return code
This will aid in diagnosing failures.
2017-08-30 14:20:44 -04:00
Christian Pfeiffer
fd4406f33e IRSL: Add Intel compiler support
Fixes: #16891
Fixes: #9903
2017-08-30 19:24:59 +02:00
Matthias Maennich
14d9a11be9 ListFileLexer: fix heap-buffer-overflow on malicious input
In case a list file contains a null terminated string that is continued
until a later space, the lexer token information got inconsistent:

e.g. an argument   "TEST\0FOOBAR"    is passed by the lexer as a token

char* = "TEST\0FOOBAR" and length 11
             ^^ note: ascii 0x00

Using strdup in cmListFileLexer leads lexer->token.text to be allocated
with size 5 and lexer->token.length to be set to 11

A subsequent call to this function with an argument of  5 < length <= 11
wrongly assumed a sufficiently sized buffer and therefore corrupted the
heap buffer. The program might crash due to this corruption.
The case "NullTerminatedArgument" is intentionally using a quite large
'rest' to increase the chance to actually hit the issue. It will reliably
crash with address sanitizer enabled though.

This fix addresses all rules where arbitrary characters are matched to
ignore \0 in order to fall through to the rule that matches an arbitrary
character as BadCharacter.

Signed-off-by: Matthias Maennich <matthias@maennich.net>
2017-08-30 11:28:51 -04:00
Daniel Pfeifer
4022b28678 clang-tidy: blacklist "modernize" checks 2017-08-30 11:07:11 -04:00
Daniel Pfeifer
2b4c32c95f clang-format: format all code as Cpp11 2017-08-30 11:07:05 -04:00
Brad King
82d9bbf2b7 Merge topic 'add-cppcheck'
311b7b1a Add properties to run cppcheck along with the compiler

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1147
2017-08-30 10:55:24 -04:00
Brad King
2df8dbcdf2 Merge topic 'fix-find-package-mode'
18454ea4 cmake: Fix --find-package mode with imported targets

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1208
2017-08-30 10:44:36 -04:00
Brad King
c23481d051 Merge topic 'cpack-dmg-iwyu'
8c51dbdd cmCPackDragNDropGenerator: Add missing include

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1206
2017-08-30 10:44:09 -04:00
Brad King
34601c3ea0 Merge topic 'codeblocks-dedup'
053d3141 CodeBlocks: Avoid listing files multiple times

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1160
2017-08-30 10:43:30 -04:00
Brad King
0ea6aee890 Merge topic 'gettext-windows'
fb3a608f FindGettext: fix support for MS Windows gettext binaries

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1192
2017-08-30 10:42:31 -04:00
Brad King
b1d072f5b0 Merge topic 'wxwidgets-windows-xp'
cf78bf68 FindwxWidgets: Add support for Windows XP compatible buils

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1193
2017-08-30 10:41:47 -04:00
Brad King
80bc73f1b8 Merge topic 'install-CMP0054'
72a1af29 install: Avoid CMP0054 warning in generated install script

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1204
2017-08-30 10:40:59 -04:00
Brad King
f4aa346538 Merge topic 'suppress-warning-count'
32b55a58 CTestCustom: Suppress warning summary count from SunPro
81b2b089 CTestCustom: Generalize comment on warning summary suppression

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Daniel Pfeifer <daniel@pfeifer-mail.de>
Merge-request: !1197
2017-08-30 10:38:31 -04:00
Brad King
92923f4cf4 Merge topic 'update-jsoncpp'
73ed503e jsoncpp: Drop doxygen comments not recognized by Clang
1a2b62b1 jsoncpp: Add initialization to pacify scanbuild
c103a959 jsoncpp: Fix compilation on SunPro
0a0f7106 jsoncpp: Drop deprecation markup
e0981955 Merge branch 'upstream-jsoncpp' into update-jsoncpp
a7241206 jsoncpp: Update script to get jsoncpp 1.8.2
cb844d41 jsoncpp: Drop unnecessary files from source list
7c06d356 Merge branch 'upstream-jsoncpp' into update-jsoncpp
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1199
2017-08-30 10:37:45 -04:00
Brad King
72a1af29c2 install: Avoid CMP0054 warning in generated install script
This could happen when an install component is called `TEST`.

Fixes: #17211
2017-08-30 10:33:13 -04:00
Tomasz Słodkowicz
cf78bf6812 FindwxWidgets: Add support for Windows XP compatible buils
Microsoft has dedicated toolset versions for XP compatible binaries
(v110 vs. v110_xp, v141 vs. v141_xp) and CMake doesn't find wxWidgets
compiled with _xp tools. This patch adds _xp to directories searched
for wxWin libraries.
2017-08-30 10:31:02 -04:00
Tomasz Słodkowicz
fb3a608f1a FindGettext: fix support for MS Windows gettext binaries
Sometimes it uses filename with .exe extension so try to match
filename with and without extension.
2017-08-30 10:29:38 -04:00
Alexandr (Sagrer) Gridnev
053d314140 CodeBlocks: Avoid listing files multiple times
Fixes: #17187
2017-08-30 10:27:24 -04:00
Bill Hoffman
311b7b1a70 Add properties to run cppcheck along with the compiler
Create a `<LANG>_CPPCHECK` target property (initialized by a
`CMAKE_<LANG>_CPPCHECK` variable) to specify a `cppcheck` command line
to be run along with the compiler.
2017-08-30 10:23:46 -04:00
Brad King
32b55a5862 CTestCustom: Suppress warning summary count from SunPro
If warnings appear we want to match and/or suppress them independently.
Always suppress the warning summary.
2017-08-30 10:22:12 -04:00
Brad King
81b2b08911 CTestCustom: Generalize comment on warning summary suppression 2017-08-30 10:22:08 -04:00
Brad King
73ed503ed5 jsoncpp: Drop doxygen comments not recognized by Clang
Some Clang versions warn with `-Wdocumentation-unknown-command` about
the `\internal` and `\snippet` command tag names.
2017-08-30 10:17:21 -04:00
Brad King
1a2b62b189 jsoncpp: Add initialization to pacify scanbuild
The scanbuild analysis cannot see that decodeUnicodeEscapeSequence
either initializes the `unicode` argument or returns `false` such
that the code following it runs only if `unicode` is initialized.
Add an explicit initialization to pacify it.
2017-08-30 10:17:17 -04:00
Brad King
c103a959d1 jsoncpp: Fix compilation on SunPro
The SunPro compiler does not support `#pragma pack`.
2017-08-30 10:17:13 -04:00
Brad King
0a0f71066f jsoncpp: Drop deprecation markup
Even though we disable warnings when building jsoncpp itself, including
its headers from other CMake sources may still cause warnings.
Additional work will be needed to port CMake to newer jsoncpp interfaces
while still supporting jsoncpp 1.0.0.  For now, just suppress the
markup.
2017-08-30 10:17:09 -04:00
Brad King
e09819557f Merge branch 'upstream-jsoncpp' into update-jsoncpp
* upstream-jsoncpp:
  jsoncpp 2017-08-27 (4cfae897)
2017-08-30 10:16:59 -04:00
Brad King
a7241206bf jsoncpp: Update script to get jsoncpp 1.8.2 2017-08-30 10:12:59 -04:00
Brad King
cb844d4119 jsoncpp: Drop unnecessary files from source list 2017-08-30 10:12:55 -04:00
Brad King
7c06d35628 Merge branch 'upstream-jsoncpp' into update-jsoncpp 2017-08-30 10:12:40 -04:00
Brad King
ee68d3eb8c jsoncpp: Add script to update from upstream 2017-08-30 10:12:10 -04:00
Brad King
fff28e30cd Merge topic 'no-crlf-blobs'
ebc91a44 Avoid CRLF newlines in Git repo blobs
c69b4c8d bzip2: Drop unused .dsp files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !1211
2017-08-30 10:02:05 -04:00
Craig Scott
54efb7e07a Merge topic 'doc-dev-review-messages'
ee51f374 Help/dev: Add commit reference format to review process guide
c928439c Help/dev: Organize commit message instructions into subsections

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1182
2017-08-30 08:33:00 -04:00
Brad King
ebc91a4452 Avoid CRLF newlines in Git repo blobs
In commit 8ed03baa76 (gitattributes: prefer `eol=crlf` to `-crlf`,
2017-08-23) we left a few CRLF blobs in the repository.  Some Git
versions get confused by text files with CRLF blobs.  Convert them
to LF blobs.  Use the `eol=crlf` attribute to tell Git to use CRLF
on checkout.
2017-08-30 08:29:43 -04:00
Brad King
c69b4c8dfe bzip2: Drop unused .dsp files 2017-08-30 06:56:49 -04:00