summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'doc-xref-prefix-path'Brad King2017-08-312-12/+19
|\ | | | | | | | | | | | | | | 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
| * Help: Cross-reference and clarify CMAKE_FIND_NO_INSTALL_PREFIX docsBrad King2017-08-302-12/+19
| | | | | | | | Suggested-by: Luke Yeager <lukeyeager@users.noreply.github.com>
* | Merge topic 'test-server-result'Brad King2017-08-312-1/+2
|\ \ | | | | | | | | | | | | | | | | | | ea359bc5 Tests: Teach Server test to print server return code Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1212
| * | Tests: Teach Server test to print server return codeBrad King2017-08-302-1/+2
| | | | | | | | | | | | This will aid in diagnosing failures.
* | | Merge topic 'irsl-intel'Brad King2017-08-312-1/+144
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | IRSL: Add Intel compiler supportChristian Pfeiffer2017-08-302-2/+138
| | | | | | | | | | | | | | | | | | | | Fixes: #16891 Fixes: #9903
| * | | IRSL: Install VC++ OpenMP libraries only for MSVCChristian Pfeiffer2017-08-231-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | At the moment, the Visual C++ OpenMP libraries will be installed for all compilers simulating MSVC. They should however only be provided if we're dealing with actual MSVC.
* | | | Merge topic 'lexer-null'Brad King2017-08-316-98/+123
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 14d9a11b ListFileLexer: fix heap-buffer-overflow on malicious input Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1153
| * | | | ListFileLexer: fix heap-buffer-overflow on malicious inputMatthias Maennich2017-08-306-98/+123
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | CMake Nightly Date StampKitware Robot2017-08-311-1/+1
| |_|_|/ |/| | |
* | | | Merge branch 'release-3.9'Brad King2017-08-300-0/+0
|\ \ \ \ | |_|_|/ |/| | |
| * | | Merge branch 'fix-find-package-mode' into release-3.9Brad King2017-08-292-1/+3
| |\ \ \ | | | | | | | | | | | | | | | Merge-request: !1208
| * \ \ \ Merge branch 'cpack-dmg-iwyu' into release-3.9Brad King2017-08-291-0/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !1206
* | \ \ \ \ Merge topic 'add-cppcheck'Brad King2017-08-3024-12/+184
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 311b7b1a Add properties to run cppcheck along with the compiler Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1147
| * | | | | | Add properties to run cppcheck along with the compilerBill Hoffman2017-08-3024-12/+184
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | Merge topic 'fix-find-package-mode'Brad King2017-08-302-1/+3
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 18454ea4 cmake: Fix --find-package mode with imported targets Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1208
| * | | | | | cmake: Fix --find-package mode with imported targetsBrad King2017-08-292-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The change in commit v3.9.0-rc1~116^2~6 (cmakemain: use script role for -P, 2017-05-11) accidentally left project commands out of find-package mode, causing packages that provide imported targets to break. Fixes: #17124
* | | | | | | Merge topic 'cpack-dmg-iwyu'Brad King2017-08-301-0/+1
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8c51dbdd cmCPackDragNDropGenerator: Add missing include Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1206
| * | | | | | cmCPackDragNDropGenerator: Add missing includeBrad King2017-08-291-0/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We use `std::sort` and so must include `<algorithm>`. Issue: #17233
* | | | | | Merge topic 'codeblocks-dedup'Brad King2017-08-301-6/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 053d3141 CodeBlocks: Avoid listing files multiple times Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1160
| * | | | | | CodeBlocks: Avoid listing files multiple timesAlexandr (Sagrer) Gridnev2017-08-301-6/+7
| | |/ / / / | |/| | | | | | | | | | | | | | | | Fixes: #17187
* | | | | | Merge topic 'gettext-windows'Brad King2017-08-301-2/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fb3a608f FindGettext: fix support for MS Windows gettext binaries Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1192
| * | | | | | FindGettext: fix support for MS Windows gettext binariesTomasz Słodkowicz2017-08-301-2/+6
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | Sometimes it uses filename with .exe extension so try to match filename with and without extension.
* | | | | | Merge topic 'wxwidgets-windows-xp'Brad King2017-08-301-0/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cf78bf68 FindwxWidgets: Add support for Windows XP compatible buils Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1193
| * | | | | | FindwxWidgets: Add support for Windows XP compatible builsTomasz Słodkowicz2017-08-301-0/+4
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | Merge topic 'install-CMP0054'Brad King2017-08-301-2/+2
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 72a1af29 install: Avoid CMP0054 warning in generated install script Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1204
| * | | | | install: Avoid CMP0054 warning in generated install scriptBrad King2017-08-301-2/+2
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | This could happen when an install component is called `TEST`. Fixes: #17211
* | | | | Merge topic 'suppress-warning-count'Brad King2017-08-301-4/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | CTestCustom: Suppress warning summary count from SunProBrad King2017-08-301-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If warnings appear we want to match and/or suppress them independently. Always suppress the warning summary.
| * | | | | CTestCustom: Generalize comment on warning summary suppressionBrad King2017-08-301-4/+3
| |/ / / /
* | | | | Merge topic 'update-jsoncpp'Brad King2017-08-3021-2277/+3475
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | jsoncpp: Drop doxygen comments not recognized by ClangBrad King2017-08-304-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | Some Clang versions warn with `-Wdocumentation-unknown-command` about the `\internal` and `\snippet` command tag names.
| * | | | jsoncpp: Add initialization to pacify scanbuildBrad King2017-08-301-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | jsoncpp: Fix compilation on SunProBrad King2017-08-305-0/+20
| | | | | | | | | | | | | | | | | | | | The SunPro compiler does not support `#pragma pack`.
| * | | | jsoncpp: Drop deprecation markupBrad King2017-08-304-11/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | Merge branch 'upstream-jsoncpp' into update-jsoncppBrad King2017-08-3019-2272/+3417
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * upstream-jsoncpp: jsoncpp 2017-08-27 (4cfae897)
| | * | | | jsoncpp 2017-08-27 (4cfae897)JsonCpp Upstream2017-08-2819-2271/+3417
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://github.com/open-source-parsers/jsoncpp.git at commit 4cfae897c049ec72175a3d55deda68146ad3720d (1.8.2).
| * | | | | jsoncpp: Update script to get jsoncpp 1.8.2Brad King2017-08-301-1/+1
| | | | | |
| * | | | | jsoncpp: Drop unnecessary files from source listBrad King2017-08-301-2/+0
| | | | | |
| * | | | | Merge branch 'upstream-jsoncpp' into update-jsoncppBrad King2017-08-300-0/+0
| |\ \ \ \ \ | | |/ / / /
| | * | | | jsoncpp 2014-11-20 (7165f6ac)JsonCpp Upstream2017-08-281-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://github.com/open-source-parsers/jsoncpp.git at commit 7165f6ac4c482e68475c9e1dac086f9e12fff0d0 (1.0.0).
| * | | | | jsoncpp: Add script to update from upstreamBrad King2017-08-301-0/+33
|/ / / / /
* | | | | Merge topic 'no-crlf-blobs'Brad King2017-08-3022-1266/+1043
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | Avoid CRLF newlines in Git repo blobsBrad King2017-08-3020-1043/+1043
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | bzip2: Drop unused .dsp filesBrad King2017-08-302-223/+0
| | | | | |
* | | | | | Merge topic 'doc-dev-review-messages'Craig Scott2017-08-301-0/+29
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | Help/dev: Add commit reference format to review process guideBrad King2017-08-291-0/+20
| | | | | | |
| * | | | | | Help/dev: Organize commit message instructions into subsectionsBrad King2017-08-241-0/+9
| | | | | | |
* | | | | | | Merge topic 'lexer'Daniel Pfeifer2017-08-3013-1490/+3454
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 168b97a5 Lexer: add a helper script to automate generating the lexers 376c1395 cmFortranLexer: regenerate with flex 2.6.4 (previously 2.6.1) 80c08c7c cmExprLexer: regenerate with flex 2.6.4 (previously 2.6.1) 59f78dcb cmDependsJavaLexer: regenerate with flex 2.6.4 (previously 2.6.1) d2e8351a cmCommandArgumentLexer: regenerate with flex 2.6.4 (previously 2.6.1) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1201
| * | | | | | | Lexer: add a helper script to automate generating the lexersMatthias Maennich2017-08-291-0/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | note: this depends on - a suitable flex version in PATH (currently 2.6.4) - a suitable version of 'sed' in PATH (e.g. GNU sed) Signed-off-by: Matthias Maennich <matthias@maennich.net>