summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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 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
| * | | | | | | | | InstallRequiredSystemLibraries: Find VS 2017 Update 3 redist directoryBrad King2017-08-211-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add compiler version 19.11 to our table. Fixes: #17184
| * | | | | | | | | InstallRequiredSystemLibraries: Factor redist name into variableBrad King2017-08-211-8/+18
| | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Store the `VC###` component of the `Microsoft.VC###.CRT` directory name in a variable set based on the toolchain version. Its naming convention is changed by VS 15.3.
* | | | | | | | | Merge topic 'revert-macos-hidpi-qt-dialog'Brad King2017-08-222-7/+7
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | / / / | |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | 286c75f7 macOS: Revert default Hi-DPI support in applications Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1167
| * | | | | | | macOS: Revert default Hi-DPI support in applicationsBrad King2017-08-222-7/+7
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit v3.9.0-rc1~287^2 (macOS: Enable Hi-DPI support in applications by default, 2017-04-08). It breaks iOS applications that do not use their own `MACOSX_BUNDLE_INFO_PLIST` because `NSApplication` is only for macOS apps. Until more complete support for iOS is added to CMake (e.g. with a different default plist file) we must allow our default plist file to work for both macOS and iOS. Fixes: #17179
* | | | | | | CMake Nightly Date StampKitware Robot2017-08-221-1/+1
| | | | | | |
* | | | | | | Merge topic 'perf-targetIter-missedGenerators'Craig Scott2017-08-2110-34/+39
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7bc65770 Performance: Fix a few more unnecessary vector copies missed in af3fd6f Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1157
| * | | | | | | Performance: Fix a few more unnecessary vector copies missed in af3fd6fAaron Orenstein2017-08-1810-34/+39
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge topic 'cpack-extend-test-capabilities'Brad King2017-08-212-0/+9
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 80047bd6 CPack: extend testing framework Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1162
| * | | | | | | CPack: extend testing frameworkDomen Vrankar2017-08-192-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some CPack tests require running commands after the inclusion of CPack.cmake and this patch enables such tests to declare run_after_include_cpack function which is run after the inclusion.
* | | | | | | | Merge topic 'autogen-macro-names'Brad King2017-08-2117-15/+150
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b3d98c6e Autogen: Add release notes for AUTOMOC_MACRO_NAMES 7529d84f Autogen: Add documentation for AUTOMOC_MACRO_NAMES 05891d8f Autogen: Add test for AUTOMOC_MACRO_NAMES 93f0ba28 Autogen: Add AUTOMOC_MACRO_NAMES support Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1156
| * | | | | | | | Autogen: Add release notes for AUTOMOC_MACRO_NAMESSebastian Holtermann2017-08-181-0/+12
| | | | | | | | |
generated by cgit v0.12 at 2025-01-08 05:09:49 (GMT)