summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* bzip2: Drop unused .dsp filesBrad King2017-08-302-223/+0
|
* Merge branch 'release-3.9'Brad King2017-08-290-0/+0
|\
| * Merge branch 'revert-xcode-9-new-buildsystem-support' into release-3.9Brad King2017-08-242-13/+5
| |\ | | | | | | | | | Merge-request: !1183
* | | CMake Nightly Date StampKitware Robot2017-08-291-1/+1
| | |
* | | Merge topic 'lexer'Brad King2017-08-282-278/+435
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | ef41bf85 cmListFileLexer: regenerate with flex 2.6.4 (previously 2.6.1) 9cacb0cb cmListFileLexer: fix 'bail out on seek-errors' also in original file Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1185
| * | | cmListFileLexer: regenerate with flex 2.6.4 (previously 2.6.1)Matthias Maennich2017-08-252-276/+429
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | flex 2.6.3 introduces symbol remapping through macro definitions. hence the change appears bigger than one would expect from a minor version upgrade. In addition some manual cleanup that had to be done previously is now obsolete. namely: - the size_t cast of _yybytes_len in yy_scan_bytes (i is now also defined int and not size_t anymore) - the redefinition of yyl within yy_find_action (yyl is now already defined as int) Line number preprocessor directives (#line) were previously generated into the c source file. This actually breaks debugging as debuggers have a hard time finding the original cmListFileLexer.in.l and mapping the current instruction to a meaningful location within that file. The prefix "cmListFileLexer_yy" can already be set as %option directly. For convenience also provide a sed command for all the manual steps that need to be done after generating. Signed-off-by: Matthias Maennich <matthias@maennich.net>
| * | | cmListFileLexer: fix 'bail out on seek-errors' also in original fileMatthias Maennich2017-08-251-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The commit v3.9.0-rc1~502^2 (cmListFileLexer: bail out on seek-errors, 2017-02-19) for bug # 16607 was only applied to the generated file. Also apply the fix now to the original. Signed-off-by: Matthias Maennich <matthias@maennich.net>
* | | | Merge topic 'cpackifw-repositories-directories'Brad King2017-08-284-0/+54
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5fe64511 CPackIFW: Add CPACK_IFW_REPOSITORIES_DIRECTORIES variable Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1150
| * | | | CPackIFW: Add CPACK_IFW_REPOSITORIES_DIRECTORIES variableKonstantin Podsvirov2017-08-174-0/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add CPACK_IFW_REPOSITORIES_DIRECTORIES variable to specify additional repositories dirs that will be used to resolve and repack dependent components
* | | | | Merge topic 'FindQt4-do-not-assume-all-libraries-are-frameworks'Brad King2017-08-281-6/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 33161f48 FindQt4: Do not assume all libraries are frameworks Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1169
| * | | | | FindQt4: Do not assume all libraries are frameworksJean-Christophe Fillion-Robin2017-08-211-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since on MacOSX not all modules are available as "framework" (e.g libQtUiTools.a), the assumption made in "FindQt4.cmake" is not always valid and systematically setting the imported libraries location to framework location is incorrect. This commit increases the robustness of the logic by first checking if the location exists. Fixes #17195
* | | | | | Merge topic 'fix-gnu-to-ms'Brad King2017-08-281-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f362052b GNUToMS: Tolerate existence of a %USERPROFILE%/source directory Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1164
| * | | | | | GNUToMS: Tolerate existence of a %USERPROFILE%/source directoryAlbert Ziegenhagel2017-08-251-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The VS environment script we load changes the working directory to `%USERPROFILE%/source` if it exists. Set `VSCMD_START_DIR` to tell the script to retain the current working directory.
* | | | | | | Merge topic 'gnu-to-ms-ninja-support'Brad King2017-08-281-1/+10
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d2d7ae07 Ninja: Implement support for GNUToMS Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1165
| * | | | | | | Ninja: Implement support for GNUToMSAlbert Ziegenhagel2017-08-251-1/+10
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Port the implementation from `cmMakefileTargetGenerator::GetLinkRule`. Fixes: #13870
* | | | | | | Merge topic 'test-fix-vs15-toolset-v90'Brad King2017-08-281-1/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ce602feb Tests: Fix RunCMake.BuildDepends on VS 2017 with v90 toolset Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1186
| * | | | | | | Tests: Fix RunCMake.BuildDepends on VS 2017 with v90 toolsetBrad King2017-08-251-1/+2
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | The MSVC toolsets v100 and below forget to re-link when a manifest changes. Exclude this part of the test case for them.
* | | | | | | CMake Nightly Date StampKitware Robot2017-08-281-1/+1
| | | | | | |
* | | | | | | Merge topic 'server-cxx11'Daniel Pfeifer2017-08-2713-66/+42
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 27d87fbd CTestCustom: Suppress exception loosening warning 7f29bbe6 server: always enable server 4614a3b2 server: backport to C++11 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1149
| * | | | | | | CTestCustom: Suppress exception loosening warningDaniel Pfeifer2017-08-261-0/+1
| | | | | | | |
| * | | | | | | server: always enable serverDaniel Pfeifer2017-08-269-61/+19
| | | | | | | |
| * | | | | | | server: backport to C++11Daniel Pfeifer2017-08-264-6/+23
| | |/ / / / / | |/| | | | |
* | | | | | | Merge topic 'cmSourceFile-Nocopy'Daniel Pfeifer2017-08-271-4/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 687aef91 cmSourceFile: Avoid unnecessary vector copy Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1190
| * | | | | | | cmSourceFile: Avoid unnecessary vector copySebastian Holtermann2017-08-261-4/+4
| | | | | | | |
* | | | | | | | Merge topic 'iwyu-keep-cmConfigure'Daniel Pfeifer2017-08-27318-333/+285
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ca2233e3 IWYU: Mark cmConfigure.h with pragma: keep Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1187
| * | | | | | | | IWYU: Mark cmConfigure.h with pragma: keepDaniel Pfeifer2017-08-26318-333/+285
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | Also remove `#include "cmConfigure.h"` from most source files.
* | | | | | | | Merge topic 'cmConfigure-fix'Daniel Pfeifer2017-08-271-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 367a348a cmConfigure: Add missing # Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1189
| * | | | | | | | cmConfigure: Add missing #Daniel Pfeifer2017-08-261-1/+1
| | |/ / / / / / | |/| | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2017-08-271-1/+1
| | | | | | | |
* | | | | | | | Merge topic 'deb-libarchive-ar'Daniel Pfeifer2017-08-261-271/+19
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | df556e65 cmCPackDebGenerator: Use libarchive to create .deb file Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1181
| * | | | | | | cmCPackDebGenerator: Use libarchive to create .deb fileDaniel Pfeifer2017-08-251-271/+19
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the copy of OpenBSD's 'ar' implementation and instead use cmArchiveWrite with the "arbsd" format.
* | | | | | | CMake Nightly Date StampKitware Robot2017-08-261-1/+1
|/ / / / / /
* | | | | | Merge topic 'cxx11-nullptr'Brad King2017-08-25235-1214/+1167
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5962db43 Use C++11 nullptr Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1175
| * | | | | | Use C++11 nullptrDaniel Pfeifer2017-08-24235-1214/+1167
| | | | | | |
* | | | | | | Merge topic 'revert-xcode-9-new-buildsystem-support'Brad King2017-08-252-13/+5
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9ecee256 Xcode: Revert addition of "outputPaths" to custom command build phase Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1183
| * | | | | | Xcode: Revert addition of "outputPaths" to custom command build phaseBrad King2017-08-242-13/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The change in commit v3.9.0~3^2 (Xcode: Add "outputPaths" to custom command script build phase, 2017-07-13) was meant to support Xcode 9's new build system. However, without matching "inputPaths", Xcode will not re-run the build phase if its outputs have already been generated. This broke the old Xcode build system too. Revert the change for now so at least the old Xcode build system works. Further investigation will be needed to add proper support for Xcode 9's new build system. Fixes: #17178
* | | | | | | Merge topic 'modernize-git-whitespace-attributes'Brad King2017-08-2515-44/+36
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8ed03baa gitattributes: prefer `eol=crlf` to `-crlf` 40470031 MumpsCoverage: remove unnecessary attribute d20485d8 gitattributes: prefer `eol=lf` to `crlf=input` b85c2589 gitattributes: prefer `-text` for binary files 377f3685 gitattributes: remove unused attributes Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1173
| * | | | | | | gitattributes: prefer `eol=crlf` to `-crlf`Ben Boeckel2017-08-238-28/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `crlf` attribute is deprecated in Git. This also changes the given files to be in the index using LF newlines, but they will be checked out with CRLF newlines due to the attribute.
| * | | | | | | MumpsCoverage: remove unnecessary attributeBen Boeckel2017-08-231-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The file has Unix newline endings.
| * | | | | | | gitattributes: prefer `eol=lf` to `crlf=input`Ben Boeckel2017-08-232-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `crlf` attribute is deprecated in Git.
| * | | | | | | gitattributes: prefer `-text` for binary filesBen Boeckel2017-08-237-7/+8
| | | | | | | |
| * | | | | | | gitattributes: remove unused attributesBen Boeckel2017-08-231-2/+0
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2017-08-251-1/+1
| |_|_|/ / / / |/| | | | | |
* | | | | | | Merge branch 'release-3.9'Brad King2017-08-240-0/+0
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Merge branch 'ninja-cl-intl' into release-3.9Brad King2017-08-231-0/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !1179
* | \ \ \ \ \ \ Merge topic 'ninja-cl-intl'Brad King2017-08-241-0/+1
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | de9840d1 Ninja: Fix support for MSVC with non-English output Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1179
| * | | | | | | Ninja: Fix support for MSVC with non-English outputBrad King2017-08-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With MSVC the Ninja generator extracts the `cl -showIncludes` prefix. When MSVC is configured to have non-English output, e.g. via `VSLANG=2052` in the environment, then `cl` prints the prefix encoded for the current code page, which is not necessarily UTF-8 encoding. Currently we fail to convert the prefix to our internal UTF-8 encoding, but assume it is UTF-8 later. While writing `rules.ninja`, the Ninja generator converts our internal UTF-8 encoding to the current code page. The `msvc_deps_prefix =` line needs to be encoded as the current code page so that `ninja` can match in the output from `cl -showIncludes` during the build. Prior to commit v3.9.0-rc1~47^2 (codecvt: Re-implement do_out and do_unshift, 2017-05-25), the non-UTF-8 prefix extracted above was written without noticing its incorrect internal encoding. The `rules.ninja` file was successfully written, but possibly with a mangled `msvc_deps_prefix`. Since that commit the output stream correctly rejects the non-UTF-8 byte sequence and writing `rules.ninja` fails. Fix this by correctly converting the `cl -showIncludes` output from the current code page to our internal UTF-8 encoding. Fixes: #17191
* | | | | | | | Merge topic 'vs-sdk-refs'Brad King2017-08-241-3/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | efd0c013 VS: Fix VS_SDK_REFERENCES when target is not a Windows 10 app Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1166
| * | | | | | | | VS: Fix VS_SDK_REFERENCES when target is not a Windows 10 appRoc Ramon2017-08-231-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Close the `<ItemGroup>` element whenever it is opened.
* | | | | | | | | Merge topic 'boost-1.65'Brad King2017-08-242-10/+59
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fa114e7d FindBoost: Add Boost 1.65 dependencies e66e8e89 BoostScanDeps: Special case python and numpy and variants Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1172