summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'release-3.13'Brad King2018-12-100-0/+0
|\
| * Merge branch 'cuda-arch-turing' into release-3.13Brad King2018-12-101-2/+16
| |\ | | | | | | | | | Merge-request: !2724
* | \ Merge topic 'cuda-arch-turing'Brad King2018-12-100-0/+0
|\ \ \ | | |/ | |/| | | | | | | | | | | | | 7a5a8eb0c5 CUDA: Add CUDA 10 (Turing) detection Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2724
| * | CUDA: Add CUDA 10 (Turing) detectionAnton Chernov2018-12-101-2/+16
| | |
* | | Merge topic 'autogen-cleanups'Brad King2018-12-101-160/+72
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7630eb1975 cmQtAutoGenInitializer: Reduce code duplication Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Tobias Hunger <tobias.hunger@gmail.com> Merge-request: !2689
| * | | cmQtAutoGenInitializer: Reduce code duplicationTobias Hunger2018-12-071-160/+72
| | | | | | | | | | | | | | | | Do not repeat the code used to find uic/rcc and moc exectuables.
* | | | Merge topic 'ninja-win-long-commands'Brad King2018-12-101-2/+15
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cfd808ff19 cmLocalNinjaGenerator: Prevent echoing of lines in ninja generated batch files 2c3f2dfa5a cmLocalNinjaGenerator: Report line of failure in ninja generated batch file 2295040e85 cmLocalNinjaGenerator: Propagate failures from batch file back to ninja Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2701
| * | | | cmLocalNinjaGenerator: Prevent echoing of lines in ninja generated batch filesMark O'Neill2018-12-061-0/+1
| | | | |
| * | | | cmLocalNinjaGenerator: Report line of failure in ninja generated batch fileMark O'Neill2018-12-061-2/+14
| | | | | | | | | | | | | | | | | | | | Fixes: 18676
| * | | | cmLocalNinjaGenerator: Propagate failures from batch file back to ninjaMark O'Neill2018-12-061-1/+1
| | | | | | | | | | | | | | | | | | | | Fixes: #18676
* | | | | Merge topic 'SWIG'Brad King2018-12-1021-4/+233
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dff28141dc UseSWIG: add management of SWIG option -module 7b3d4799f8 Help: update policy 0078 documentation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2669
| * | | | | UseSWIG: add management of SWIG option -moduleMarc Chevrier2018-12-0720-4/+231
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When file property SWIG_MODULE_NAME is specified, provide option -module to SWIG compiler. Fixes: #18374
| * | | | | Help: update policy 0078 documentationMarc Chevrier2018-12-071-0/+2
| | |/ / / | |/| | |
* | | | | Merge topic 'cuda-arch-turing'Brad King2018-12-101-2/+16
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0f9533e61b CUDA: Add CUDA 10 (Turing) detection Acked-by: Kitware Robot <kwrobot@kitware.com> Reviewed-by: Henry Schreiner <henryschreineriii@gmail.com> Merge-request: !2702
| * | | | | CUDA: Add CUDA 10 (Turing) detectionAnton Chernov2018-12-071-2/+16
| | | | | |
* | | | | | Merge topic 'file-read_symlink'Brad King2018-12-1014-4/+98
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 31840e363f file: Fix formatting of error in SIZE sub-command 98a39be6cf file: Add READ_SYMLINK sub-command Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2705
| * | | | | | file: Fix formatting of error in SIZE sub-commandKyle Edwards2018-12-063-4/+5
| | | | | | |
| * | | | | | file: Add READ_SYMLINK sub-commandKyle Edwards2018-12-0612-0/+93
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'release-3.13'Brad King2018-12-100-0/+0
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Merge branch 'backport-autogen_revert_implicit_includes' into release-3.13Brad King2018-12-073-6/+24
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !2709
| * \ \ \ \ \ Merge branch 'cpack-status-callback' into release-3.13Brad King2018-12-073-0/+13
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !2696
* | \ \ \ \ \ \ Merge topic 'cpack-status-callback'Brad King2018-12-103-0/+13
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4a3ae1710e CPack/External: Fix status messages of staging scripts Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2696
| * | | | | | | CPack/External: Fix status messages of staging scriptsNils Gladitz2018-12-073-0/+13
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set progress callback on cmake instance used by CPack. The progress callback is used to output STATUS messages which are otherwise missing when issued from e.g. CPack External staging scripts. Fixes: #18567
* | | | | | | Merge topic 'autogen_revert_implicit_includes'Brad King2018-12-103-4/+21
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e5a4007a3b Merge branch 'backport-autogen_revert_implicit_includes' 4be7f38d57 Autogen: Revert passing compiler implicit includes to moc 187481d4d9 Autogen: Revert passing compiler implicit includes to moc Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2709
| * \ \ \ \ \ \ Merge branch 'backport-autogen_revert_implicit_includes'Brad King2018-12-071-0/+13
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | * | | | | | Autogen: Revert passing compiler implicit includes to mocSebastian Holtermann2018-12-073-6/+24
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Passing an incomplete list of compiler include directories causes a regression in the KIO project (and probably others). We need to disable it until the complete list is available (see #16291). Fixes: #18669 Issue: #18041
| * | | | | | Autogen: Revert passing compiler implicit includes to mocSebastian Holtermann2018-12-072-4/+8
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Passing an incomplete list of compiler include directories causes a regression in the KIO project (and probably others). We need to disable it until the complete list is available (see #16291). Fixes: #18669 Issue: #18041
* | | | | | CMake Nightly Date StampKitware Robot2018-12-101-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2018-12-091-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2018-12-081-1/+1
| | | | | |
* | | | | | Merge topic 'vs-json-flag-table'Brad King2018-12-0774-4092/+18237
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8107508b3e Remove old flag table headers 6d855fbf44 Replace header flag tables with json reading 9c60ae5f11 VS: Add flag table entry for -JMC 584ad067ba VS: Fix flag table entry for -Qspectre 8df25f9400 VS: connect /Y- compiler option with "Not Using Precompiled Headers" f1223e34c6 VS: Add v140 flag table entries for `-Zc:inline[-]` efc90eed77 VS: Fix regressed mapping for the cl `/Os` compiler flag 36b7fc7db6 VS 14: Add flag map for -std= to CppLanguageStandard tag in project files ... Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2611
| * | | | | | Remove old flag table headersStephan Szabo2018-11-2830-3896/+0
| | | | | | |
| * | | | | | Replace header flag tables with json readingStephan Szabo2018-11-288-177/+242
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Stop loading flag tables from header files and instead load the flag table information from json files in Templates/MSBuild/FlagTables.
| * | | | | | VS: Add flag table entry for -JMCStephan Szabo2018-11-281-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original header commit 516c6fc38c0bdfd7905edb169a4ebfef689cf116 Add support for mapping Just My Code compiler flag
| * | | | | | VS: Fix flag table entry for -QspectreStephan Szabo2018-11-281-8/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Qspectre option was generated by the script (as opposed to being added by commit v3.13.0-rc1~4^2 (VS: Add flag table entry for -Qspectre, 2018-10-08), however the comment was not useful and there was a separate off option generated that was not in the old table.
| * | | | | | VS: connect /Y- compiler option with "Not Using Precompiled Headers"Stephan Szabo2018-11-285-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original header commit v3.10.0-rc1~423^2 The change allows to selectively disable PrecompiledHeaders. Despite the `$(VCTargetsPath)/1033/cl.xml` contains an empty value for switch, for effectively turn off setting need to use /Y- option as described on msdn: https://msdn.microsoft.com/en-us/library/1hy7a92h.aspx
| * | | | | | VS: Add v140 flag table entries for `-Zc:inline[-]`Stephan Szabo2018-11-282-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note: Zc:inline was added by generator, but not the - version. Original header commit v3.7.2~8^2 The documentation of this option [1] claims that the default is off, but VS seems to use `-Zc:inline` by default if `RemoveUnreferencedCodeData` does not appear in the `.vcxproj` file. Add the flag table entry to allow use of the flag to be configured. [1] https://msdn.microsoft.com/en-us/library/dn642448.aspx
| * | | | | | VS: Fix regressed mapping for the cl `/Os` compiler flagStephan Szabo2018-11-282-14/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original header commit v3.6.0-rc3~8^2 In commit v3.6.0-rc1~279^2~10 (VS: in Clang/C2 toolset, setup correct compiler settings, 2016-02-18) a flag mapping was added for the clang `-Os` flag. However, this collides with a mapping we already had for the MSVC flag of the same name. This is a symptom of a larger problem in that the VS generators need a per-toolset flag map (issue #16153). For now, simply drop the new mapping and drop `-Os` from clang compiler flags in the MinSizeRel configuration.
| * | | | | | VS 14: Add flag map for -std= to CppLanguageStandard tag in project filesStephan Szabo2018-11-282-0/+126
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original header commit v3.6.0-rc1~279^2~8 This is used by the Clang/C2 toolset.
| * | | | | | VS: in Clang/C2 toolset, setup correct compiler settingsStephan Szabo2018-11-282-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Original header commit v3.6.0-rc1~279^2~10
| * | | | | | VS: Fix /analyze:log flag mapping (#14858)Stephan Szabo2018-11-284-56/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original header commits: v11/v12 commit v3.1.0-rc1~695^2 v140/v141 commit v3.1.0-rc1~358^2~3 Fix the VS 11 and VS 12 flag table entries for this flag. It requires a value in the following argument. Also drop the general "/analyze:" flag table entry so that such flags will be passed through as plain additional options. This is necessary because some such options have following values and some do not but not all have .vcxproj elements to hold the values.
| * | | | | | VS: Fix CSharp support for win32res: and win32icon: flagsStephan Szabo2018-11-285-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original header commit v3.13.0-rc2~6^2 Add a missing `:` to these entries in the flag table. The user value is always required and must come after the `:`.
| * | | | | | Vs: remove /nowin32manifest from C# flags to enable default VS behaviorStephan Szabo2018-11-285-15/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original header commit v3.10.0-rc1~494^2 if /nowin32manifest is specified, it will be preferred over any occurring /win32manifest:<file> parameter
| * | | | | | MSVC: Add support for ARM64 architectureStephan Szabo2018-11-281-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The v141_Link.json already appeared to have the option included, so onlyh adding the change to v14_LIB.json. Original header commit v3.10.0-rc1~132^2 Visual Studio 15.4 adds support for this architecture.
| * | | | | | VS: Fix MANIFESTUAC link flag map to .vcxproj elementsStephan Szabo2018-11-285-105/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original header commit v3.10.0-rc1~97^2 Add special parsing of the flags given in `/MANIFESTUAC:"..."` in order to map them correctly to `.vcxproj` elements. Keep the old incorrect flag table entries for `uiAccess` and `level` flags for compatibility even though they do not really exist. Fixes: #16563
| * | | | | | VS: Fix support for '/guard:cf' linker flagStephan Szabo2018-11-282-14/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original header commit v3.9.0-rc6~12^2 Although `$(VCTargetsPath)/1033/link.xml` for v140 and v141 toolsets contains an entry for `LinkControlFlowGuard`, it does not work when used in a `.vcxproj` file. Drop our link flag table entries for these toolsets so that the flag will be passed via `AdditionalOptions`.
| * | | | | | VS: Add v140 and v141 flag table entries for /DEBUG:NONE and /DEBUG:FULLStephan Szabo2018-11-282-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DEBUG:FULL was already added for v141 from the generation. Original header commit v3.9.0-rc6~15^2
| * | | | | | VS: Map the link `/debug` to its IDE propertyStephan Szabo2018-11-285-22/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix issues with "GenerateDebugInformation". These are mostly from the following commits, but also include a related fix to the v140/v141 file. Original header commits: v10-v14 commit v3.5.0-rc1~71^2 v140/v141 commit v3.9.0-rc6~15^2~1
| * | | | | | VS: Fix /MANIFESTUAC:NO linker option mappingStephan Szabo2018-11-285-25/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original header commits: v10/v11/v12 commit v3.0.0-rc5~3^2 v140 commit v3.1.0-rc1~358^2~3 There are no versions of /MANIFESTUAC:NO where addition values are appended. Remove both of the MANIFESTUAC:NO entries from our flag tables and replace them with one which would set EnableUAC to false and immediately stop processing the /MANIFESTUAC:NO option.
| * | | | | | VS: Manually fix MASM flag table entriesStephan Szabo2018-11-284-20/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original header commit v3.1.0-rc1~154^2~5 Drop '"[value]"' placeholders.
generated by cgit v0.12 at 2025-02-07 14:59:31 (GMT)