Commit Graph

37025 Commits

Author SHA1 Message Date
Tin Huynh 97f0b177df PGI-Fortran: Remove -Kieee and -Mpreprocess
Fixes #17209
2017-09-05 17:35:07 -07:00
Brad King 8da7adc22b Merge branch 'release-3.9' 2017-08-29 11:27:52 -04:00
Kitware Robot 5eb6d200f4 CMake Nightly Date Stamp 2017-08-29 00:01:08 -04:00
Brad King a6374b88d9 Merge topic 'lexer'
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
2017-08-28 09:54:36 -04:00
Brad King 55e281c3b7 Merge topic 'cpackifw-repositories-directories'
5fe64511 CPackIFW: Add CPACK_IFW_REPOSITORIES_DIRECTORIES variable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1150
2017-08-28 09:53:10 -04:00
Brad King 39889d778e Merge topic 'FindQt4-do-not-assume-all-libraries-are-frameworks'
33161f48 FindQt4: Do not assume all libraries are frameworks

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1169
2017-08-28 09:52:27 -04:00
Brad King 3e5175447b Merge topic 'fix-gnu-to-ms'
f362052b GNUToMS: Tolerate existence of a %USERPROFILE%/source directory

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1164
2017-08-28 09:51:57 -04:00
Brad King 072296fc16 Merge topic 'gnu-to-ms-ninja-support'
d2d7ae07 Ninja: Implement support for GNUToMS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1165
2017-08-28 09:49:31 -04:00
Brad King f267505c53 Merge topic 'test-fix-vs15-toolset-v90'
ce602feb Tests: Fix RunCMake.BuildDepends on VS 2017 with v90 toolset

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1186
2017-08-28 09:46:13 -04:00
Kitware Robot f8e9a848fb CMake Nightly Date Stamp 2017-08-28 00:01:08 -04:00
Daniel Pfeifer e710d6953d Merge topic 'server-cxx11'
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
2017-08-27 04:02:24 -04:00
Daniel Pfeifer 19f2a706a3 Merge topic 'cmSourceFile-Nocopy'
687aef91 cmSourceFile: Avoid unnecessary vector copy

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1190
2017-08-27 03:52:47 -04:00
Daniel Pfeifer b044dedecd Merge topic 'iwyu-keep-cmConfigure'
ca2233e3 IWYU: Mark cmConfigure.h with pragma: keep

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1187
2017-08-27 03:52:05 -04:00
Daniel Pfeifer a51d04d4bf Merge topic 'cmConfigure-fix'
367a348a cmConfigure: Add missing #

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1189
2017-08-27 03:51:08 -04:00
Kitware Robot 6dfb8dadc3 CMake Nightly Date Stamp 2017-08-27 00:01:06 -04:00
Daniel Pfeifer 27d87fbd04 CTestCustom: Suppress exception loosening warning 2017-08-26 20:38:07 +02:00
Sebastian Holtermann 687aef913c cmSourceFile: Avoid unnecessary vector copy 2017-08-26 14:45:46 +02:00
Daniel Pfeifer 2ade9a0264 Merge topic 'deb-libarchive-ar'
df556e65 cmCPackDebGenerator: Use libarchive to create .deb file

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1181
2017-08-26 08:20:41 -04:00
Daniel Pfeifer 367a348a00 cmConfigure: Add missing # 2017-08-26 08:30:49 +02:00
Daniel Pfeifer 7f29bbe6f2 server: always enable server 2017-08-26 07:46:58 +02:00
Daniel Pfeifer 4614a3b287 server: backport to C++11 2017-08-26 07:46:57 +02:00
Daniel Pfeifer ca2233e31f IWYU: Mark cmConfigure.h with pragma: keep
Also remove `#include "cmConfigure.h"` from most source files.
2017-08-26 07:41:04 +02:00
Kitware Robot 6285fe009d CMake Nightly Date Stamp 2017-08-26 00:01:17 -04:00
Daniel Pfeifer df556e65f2 cmCPackDebGenerator: Use libarchive to create .deb file
Remove the copy of OpenBSD's 'ar' implementation and instead
use cmArchiveWrite with the "arbsd" format.
2017-08-25 23:01:50 +02:00
Albert Ziegenhagel f362052b81 GNUToMS: Tolerate existence of a %USERPROFILE%/source directory
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.
2017-08-25 14:24:24 -04:00
Albert Ziegenhagel d2d7ae0738 Ninja: Implement support for GNUToMS
Port the implementation from `cmMakefileTargetGenerator::GetLinkRule`.

Fixes: #13870
2017-08-25 13:59:51 -04:00
Brad King ebe436eb97 Merge topic 'cxx11-nullptr'
5962db43 Use C++11 nullptr

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1175
2017-08-25 11:26:24 -04:00
Brad King 53305ce5b0 Merge topic 'revert-xcode-9-new-buildsystem-support'
9ecee256 Xcode: Revert addition of "outputPaths" to custom command build phase

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1183
2017-08-25 11:05:05 -04:00
Brad King a749fcb3d0 Merge topic 'modernize-git-whitespace-attributes'
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
2017-08-25 11:04:05 -04:00
Matthias Maennich ef41bf8531 cmListFileLexer: regenerate with flex 2.6.4 (previously 2.6.1)
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>
2017-08-25 16:54:41 +02:00
Matthias Maennich 9cacb0cba4 cmListFileLexer: fix 'bail out on seek-errors' also in original file
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>
2017-08-25 16:53:19 +02:00
Brad King ce602febf0 Tests: Fix RunCMake.BuildDepends on VS 2017 with v90 toolset
The MSVC toolsets v100 and below forget to re-link when a manifest
changes.  Exclude this part of the test case for them.
2017-08-25 09:55:50 -04:00
Kitware Robot 9538d22d95 CMake Nightly Date Stamp 2017-08-25 00:01:07 -04:00
Daniel Pfeifer 5962db4389 Use C++11 nullptr 2017-08-24 23:39:47 +02:00
Brad King e498dad3f2 Merge branch 'revert-xcode-9-new-buildsystem-support' into release-3.9
Merge-request: !1183
2017-08-24 11:43:06 -04:00
Brad King 9ecee256f8 Xcode: Revert addition of "outputPaths" to custom command build phase
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
2017-08-24 10:56:48 -04:00
Brad King c7c639f2f3 Merge branch 'release-3.9' 2017-08-24 09:37:10 -04:00
Brad King 229c37a54b Merge topic 'ninja-cl-intl'
de9840d1 Ninja: Fix support for MSVC with non-English output

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1179
2017-08-24 09:35:01 -04:00
Brad King 797196c8a7 Merge topic 'vs-sdk-refs'
efd0c013 VS: Fix VS_SDK_REFERENCES when target is not a Windows 10 app

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1166
2017-08-24 09:34:43 -04:00
Brad King 65ca67cef1 Merge topic 'boost-1.65'
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
2017-08-24 09:34:22 -04:00
Brad King 94299c496d Merge topic 'ninja-gfortran-fpreprocessed'
90a34ff7 Ninja: Fix references to source files in gfortran diagnostics

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1146
2017-08-24 09:33:55 -04:00
Brad King 061b4f24be Merge topic 'ipo-test-output'
6756b552 Tests: Print more info on CheckIPOSupported test failure

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1177
2017-08-24 09:33:24 -04:00
Kitware Robot fe19fda2aa CMake Nightly Date Stamp 2017-08-24 00:01:11 -04:00
Roc Ramon efd0c01337 VS: Fix VS_SDK_REFERENCES when target is not a Windows 10 app
Close the `<ItemGroup>` element whenever it is opened.
2017-08-23 15:43:46 -04:00
Raul Laasner 90a34ff791 Ninja: Fix references to source files in gfortran diagnostics
The Ninja generator preprocesses and compiles separately for Fortran.
When compiling, tell gfortran that the source is already preprocessed so
that it will honor the `# <line>` directives when producing diagnostics
messages.

Fixes: #17160
2017-08-23 15:32:44 -04:00
Ben Boeckel 8ed03baa76 gitattributes: prefer eol=crlf to -crlf
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.
2017-08-23 13:31:41 -04:00
Ben Boeckel 4047003161 MumpsCoverage: remove unnecessary attribute
The file has Unix newline endings.
2017-08-23 13:31:31 -04:00
Ben Boeckel d20485d8d9 gitattributes: prefer eol=lf to crlf=input
The `crlf` attribute is deprecated in Git.
2017-08-23 13:30:00 -04:00
Ben Boeckel b85c2589a1 gitattributes: prefer -text for binary files 2017-08-23 13:30:00 -04:00
Ben Boeckel 377f3685fc gitattributes: remove unused attributes 2017-08-23 13:21:03 -04:00