summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* server: backport to C++11Daniel Pfeifer2017-08-264-6/+23
|
* 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
| * | | | | | | FindBoost: Add Boost 1.65 dependenciesRoger Leigh2017-08-221-3/+27
| | | | | | | |
| * | | | | | | BoostScanDeps: Special case python and numpy and variantsRoger Leigh2017-08-221-7/+32
| | | | | | | |
* | | | | | | | Merge topic 'ninja-gfortran-fpreprocessed'Brad King2017-08-242-1/+9
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 90a34ff7 Ninja: Fix references to source files in gfortran diagnostics Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1146
| * | | | | | | | Ninja: Fix references to source files in gfortran diagnosticsRaul Laasner2017-08-232-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | Merge topic 'ipo-test-output'Brad King2017-08-243-6/+9
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6756b552 Tests: Print more info on CheckIPOSupported test failure Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1177
| * | | | | | | | Tests: Print more info on CheckIPOSupported test failureBrad King2017-08-233-6/+9
| | | | | | | | |
* | | | | | | | | CMake Nightly Date StampKitware Robot2017-08-241-1/+1
| |_|_|/ / / / / |/| | | | | | |
* | | | | | | | Merge topic 'FindCurses-wide'Brad King2017-08-232-30/+86
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 72343d26 Help: Add notes for topic 'FindCurses-wide' 4b02afc0 FindCurses: Add option for ncursesw detection Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1161
| * | | | | | | | Help: Add notes for topic 'FindCurses-wide'Brad King2017-08-221-0/+5
| | | | | | | | |
| * | | | | | | | FindCurses: Add option for ncursesw detectionAlexandr (Sagrer) Gridnev2017-08-221-30/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a remake of the patch from issue #10347 but based on current master. Works for me on Lubuntu 17.04. Fixes: #10347
* | | | | | | | | Merge topic 'autogen-optimize-cleanup'Brad King2017-08-2312-372/+445
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8e452e67 Remove AUTOGEN variables from cmSourceFile and cmMakefile 0f2e178f Autogen: Don't use cmMakefile::GetQtUiFilesWithOptions 13bb716f Autogen: Fix and extend SKIP_AUTOMOC test 727247c3 Autogen: Read skip files from makefile 1eb1b409 Autogen: Remove VS specific code exclusion 54ec2a8b Autogen: Initializer file type scanning optimizations cf7b3b96 Autogen: Initializer optimizations and cleanups Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1171
| * | | | | | | | Remove AUTOGEN variables from cmSourceFile and cmMakefileSebastian Holtermann2017-08-224-25/+0
| | | | | | | | |
| * | | | | | | | Autogen: Don't use cmMakefile::GetQtUiFilesWithOptionsSebastian Holtermann2017-08-221-19/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The purpose of this patch is to allow later removal of AUTOGEN specific variables in cmMakefile and cmSourceFile.
| * | | | | | | | Autogen: Fix and extend SKIP_AUTOMOC testSebastian Holtermann2017-08-225-4/+59
| | | | | | | | |
| * | | | | | | | Autogen: Read skip files from makefileSebastian Holtermann2017-08-221-32/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | | | Autogen: Remove VS specific code exclusionSebastian Holtermann2017-08-221-31/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The amount of disabled code was small. Also the #ifdef tests were confusing and made testing on non Windows machines more difficult.
| * | | | | | | | Autogen: Initializer file type scanning optimizationsSebastian Holtermann2017-08-221-73/+91
| | | | | | | | |
| * | | | | | | | Autogen: Initializer optimizations and cleanupsSebastian Holtermann2017-08-223-211/+216
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge topic 'cxx11-unordered'Daniel Pfeifer2017-08-2320-131/+45
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cbcfb79f Use C++11 unordered containers Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1174
| * | | | | | | | Use C++11 unordered containersDaniel Pfeifer2017-08-2220-131/+45
| |/ / / / / / /
* | | | | | | | Merge topic 'cm_fallthrough'Daniel Pfeifer2017-08-233-3/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e4aafbf5 Fix CM_FALLTHROUGH with -Wunused-parameter Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1170
| * | | | | | | | Fix CM_FALLTHROUGH with -Wunused-parameterBrad King2017-08-223-3/+3
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the test code that we `try_compile` to avoid unused parameter warnings that cause the check to fail.
* | | | | | | | CMake Nightly Date StampKitware Robot2017-08-231-1/+1
| |/ / / / / / |/| | | | | |
* | | | | | | Merge topic 'ccg-no-mutable'Brad King2017-08-222-21/+17
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 52527468 cmCustomCommandGenerator: Avoid mutable state Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1145
| * | | | | | | cmCustomCommandGenerator: Avoid mutable stateBrad King2017-08-082-21/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expand generator expressions of DEPENDS in the constructor instead of on-demand.
* | | | | | | | Merge topic 'cmake-ice37-2'Brad King2017-08-221-4/+22
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d0a20d29 FindIce: Add support for separate Freeze NuGet package Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1152
| * | | | | | | | FindIce: Add support for separate Freeze NuGet packageRoger Leigh2017-08-171-4/+22
| | | | | | | | |
* | | | | | | | | Merge branch 'release-3.9'Brad King2017-08-220-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | |
| * | | | | | | | Merge branch 'InstallRequiredSystemLibraries-vs15.3' into release-3.9Brad King2017-08-221-11/+31
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | Merge-request: !1168
| * | | | | | | | Merge branch 'revert-macos-hidpi-qt-dialog' into release-3.9Brad King2017-08-222-7/+7
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !1167
* | \ \ \ \ \ \ \ \ Merge topic 'InstallRequiredSystemLibraries-vs15.3'Brad King2017-08-221-11/+31
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 23cf9e15 InstallRequiredSystemLibraries: Find VS 2017 Update 3 redist directory b45d8432 InstallRequiredSystemLibraries: Factor redist name into variable Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1168
generated by cgit v0.12 at 2024-11-11 07:11:10 (GMT)