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
Brad King
ebe436eb97
Merge topic 'cxx11-nullptr'
...
5962db43kwrobot@kitware.com >
Merge-request: !1175
2017-08-25 11:26:24 -04:00
Brad King
53305ce5b0
Merge topic 'revert-xcode-9-new-buildsystem-support'
...
9ecee256kwrobot@kitware.com >
Merge-request: !1183
2017-08-25 11:05:05 -04:00
Brad King
a749fcb3d0
Merge topic 'modernize-git-whitespace-attributes'
...
8ed03baa40470031d20485d8b85c2589377f3685kwrobot@kitware.com >
Merge-request: !1173
2017-08-25 11:04:05 -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
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'
...
de9840d1kwrobot@kitware.com >
Merge-request: !1179
2017-08-24 09:35:01 -04:00
Brad King
797196c8a7
Merge topic 'vs-sdk-refs'
...
efd0c013kwrobot@kitware.com >
Merge-request: !1166
2017-08-24 09:34:43 -04:00
Brad King
65ca67cef1
Merge topic 'boost-1.65'
...
fa114e7de66e8e89kwrobot@kitware.com >
Merge-request: !1172
2017-08-24 09:34:22 -04:00
Brad King
94299c496d
Merge topic 'ninja-gfortran-fpreprocessed'
...
90a34ff7kwrobot@kitware.com >
Merge-request: !1146
2017-08-24 09:33:55 -04:00
Brad King
061b4f24be
Merge topic 'ipo-test-output'
...
6756b552kwrobot@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
Brad King
6fd0c72115
Merge branch 'ninja-cl-intl' into release-3.9
...
Merge-request: !1179
2017-08-23 11:36:35 -04:00
Brad King
de9840d1b8
Ninja: Fix support for MSVC with non-English output
...
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
2017-08-23 11:10:41 -04:00
Brad King
fa664d9863
Merge topic 'FindCurses-wide'
...
72343d264b02afc0kwrobot@kitware.com >
Merge-request: !1161
2017-08-23 09:03:58 -04:00
Brad King
6756b552ee
Tests: Print more info on CheckIPOSupported test failure
2017-08-23 08:43:28 -04:00
Brad King
fc1aaf1432
Merge topic 'autogen-optimize-cleanup'
...
8e452e670f2e178f13bb716f727247c31eb1b40954ec2a8bcf7b3b96kwrobot@kitware.com >
Merge-request: !1171
2017-08-23 08:21:27 -04:00
Daniel Pfeifer
ac6660b671
Merge topic 'cxx11-unordered'
...
cbcfb79fkwrobot@kitware.com >
Merge-request: !1174
2017-08-23 05:11:40 -04:00
Daniel Pfeifer
7526b1ed32
Merge topic 'cm_fallthrough'
...
e4aafbf5kwrobot@kitware.com >
Merge-request: !1170
2017-08-23 04:03:18 -04:00
Kitware Robot
5490d0e685
CMake Nightly Date Stamp
2017-08-23 00:01:09 -04:00
Daniel Pfeifer
cbcfb79f9c
Use C++11 unordered containers
2017-08-22 23:05:27 +02:00
Sebastian Holtermann
8e452e67e9
Remove AUTOGEN variables from cmSourceFile and cmMakefile
2017-08-22 19:10:32 +02:00
Sebastian Holtermann
0f2e178f65
Autogen: Don't use cmMakefile::GetQtUiFilesWithOptions
...
The purpose of this patch is to allow later removal of
AUTOGEN specific variables in cmMakefile and cmSourceFile.
2017-08-22 19:10:32 +02:00
Sebastian Holtermann
13bb716f04
Autogen: Fix and extend SKIP_AUTOMOC test
2017-08-22 19:10:31 +02:00
Sebastian Holtermann
727247c316
Autogen: Read skip files from makefile
...
This allows to pass SKIP_AUTOMOC hints to the
FOO_autogen target from files that are not listed
in the target sources.
The problem was that if main.cpp was listed in the source
but not main.h, then SKIP_AUTOMOC for main.h was ignored.
2017-08-22 18:43:34 +02:00
Sebastian Holtermann
1eb1b409c2
Autogen: Remove VS specific code exclusion
...
The amount of disabled code was small.
Also the #ifdef tests were confusing and made
testing on non Windows machines more difficult.
2017-08-22 18:43:34 +02:00
Roger Leigh
fa114e7d70
FindBoost: Add Boost 1.65 dependencies
2017-08-22 17:03:36 +01:00
Roger Leigh
e66e8e8914
BoostScanDeps: Special case python and numpy and variants
2017-08-22 17:03:35 +01:00
Sebastian Holtermann
54ec2a8bcf
Autogen: Initializer file type scanning optimizations
2017-08-22 17:13:59 +02:00
Sebastian Holtermann
cf7b3b9671
Autogen: Initializer optimizations and cleanups
2017-08-22 17:13:59 +02:00
Brad King
72343d2604
Help: Add notes for topic 'FindCurses-wide'
2017-08-22 10:44:18 -04:00
Alexandr (Sagrer) Gridnev
4b02afc0ca
FindCurses: Add option for ncursesw detection
...
This is a remake of the patch from issue #10347 but based on current
master. Works for me on Lubuntu 17.04.
Fixes : #10347
2017-08-22 10:42:20 -04:00
Brad King
8a0ed37f61
Merge topic 'ccg-no-mutable'
...
52527468kwrobot@kitware.com >
Merge-request: !1145
2017-08-22 08:27:04 -04:00
Brad King
6b37d69cdb
Merge topic 'cmake-ice37-2'
...
d0a20d29kwrobot@kitware.com >
Merge-request: !1152
2017-08-22 08:26:44 -04:00
Brad King
33cf8e415f
Merge branch 'release-3.9'
2017-08-22 08:25:32 -04:00
Brad King
86a5b97fe8
Merge topic 'InstallRequiredSystemLibraries-vs15.3'
...
23cf9e15b45d8432kwrobot@kitware.com >
Merge-request: !1168
2017-08-22 08:24:14 -04:00
Brad King
d3d0191dcd
Merge topic 'revert-macos-hidpi-qt-dialog'
...
286c75f7kwrobot@kitware.com >
Merge-request: !1167
2017-08-22 08:21:03 -04:00
Brad King
e4aafbf596
Fix CM_FALLTHROUGH with -Wunused-parameter
...
Fix the test code that we `try_compile` to avoid unused parameter
warnings that cause the check to fail.
2017-08-22 08:13:30 -04:00
Brad King
02645aa6ae
Merge branch 'InstallRequiredSystemLibraries-vs15.3' into release-3.9
...
Merge-request: !1168
2017-08-22 07:30:30 -04:00
Brad King
3f17ccce1c
Merge branch 'revert-macos-hidpi-qt-dialog' into release-3.9
...
Merge-request: !1167
2017-08-22 07:30:20 -04:00
