summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'add-missing-fallthrough'Brad King2017-07-071-1/+2
|\ | | | | | | | | | | | | 6c80e958 cmCTest: Add missing switch case fallthrough markup Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1027
| * cmCTest: Add missing switch case fallthrough markupBrad King2017-07-051-1/+2
| | | | | | | | | | | | Without this, GCC 7 warns. Reported-by: Rolf Eike Beer <eike@sf-mail.de>
* | Merge topic 'iar_improved'Brad King2017-07-071-7/+17
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d8e6cd9e IAR: Improve support for IAR ARM Compiler 0b1a2876 Add a CMAKE_<LANG>_COMPILER_ARCHITECTURE_ID variable fea7d69d Store CMAKE_ASM_COMPILER_VERSION persistently d2a8b5ce CMakeDetermineASMCompiler: Fix small copy-paste mistake a2112257 Add infrastructure to use language extensions without any standard 8cd28bb0 cmLocalGenerator: Switch order of <LANG>_{EXTENSIONS,STANDARD} check 0fc2d78e cmLocalGenerator: Simplify logic for language standard or extension flag Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !991
| * | Add infrastructure to use language extensions without any standardBrad King2017-06-291-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When `<LANG>_STANDARD` is not set we will not add any language standard flags. If `<LANG>_EXTENSIONS` is not OFF then our default is supposed to be ON. In order to support compilers that do not enable their extensions by default, check a `CMAKE_<LANG>_EXTENSION_COMPILE_OPTION` variable for an extensions flag to use without any language standard. Suggested-by: Norbert Lange <nolange79@gmail.com>
| * | cmLocalGenerator: Switch order of <LANG>_{EXTENSIONS,STANDARD} checkBrad King2017-06-291-5/+5
| | |
| * | cmLocalGenerator: Simplify logic for language standard or extension flagBrad King2017-06-291-2/+2
| | |
* | | Merge topic 'connect_disablePCH_with_cl_option'Brad King2017-07-075-5/+10
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | d1713d8b VS: connect /Y- compiler option with "Not Using Precompiled Headers" Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1026
| * | | VS: connect /Y- compiler option with "Not Using Precompiled Headers"Olender, Sebastian D2017-07-055-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | CMake Nightly Date StampKitware Robot2017-07-071-1/+1
| | | |
* | | | Merge topic 'autogen_p'Brad King2017-07-061-1/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 251bcbed Autogen: Continue search for FOO_p.h when FOO.h was found Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1022
| * | | | Autogen: Continue search for FOO_p.h when FOO.h was foundSebastian Holtermann2017-07-021-1/+0
| | | | |
| * | | | Merge branch 'xcode-cross-sdk-object-libraries' into release-3.9Brad King2017-06-302-5/+5
| |\ \ \ \
* | | | | | CMake Nightly Date StampKitware Robot2017-07-061-1/+1
| |_|_|_|/ |/| | | |
* | | | | Merge topic 'vs-link-guard-cf'Brad King2017-07-052-6/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 82a5c2c6 VS: Fix support for '/guard:cf' linker flag Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1018
| * | | | | VS: Fix support for '/guard:cf' linker flagOlender, Sebastian D2017-06-302-6/+0
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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`.
* | | | | Merge topic 'autogen-header-skip'Brad King2017-07-051-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 83d8acee Autogen: Check .moc header name against SKIP list Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1017
| * | | | | Autogen: Check .moc header name against SKIP listSebastian Holtermann2017-06-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When encountering an #include "FOO.moc" statement where FOO.hpp was chosen over FOO.cpp as the moc source, the FOO.hpp name was not checked against the moc SKIP list.
* | | | | | CMake Nightly Date StampKitware Robot2017-07-051-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2017-07-041-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2017-07-031-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2017-07-021-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2017-07-011-1/+1
| | | | | |
* | | | | | Merge topic 'xcode-cross-sdk-object-libraries'Brad King2017-06-302-5/+5
|\ \ \ \ \ \ | | |_|/ / / | |/| | / / | |_|_|/ / |/| | | | | | | | | | | | | | c2a6df94 Xcode: Use correct Object Library paths for cross-SDK builds Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1016
| * | | | Xcode: Use correct Object Library paths for cross-SDK buildsGregor Jasny2017-06-292-5/+5
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | When calculating Object Library paths take a look at the `XCODE_EMIT_EFFECTIVE_PLATFORM_NAME` property to enable builds with different SDKs. Otherwise a hard-coded architecture could be chosen. Fixes: #16040
* | | | CMake Nightly Date StampKitware Robot2017-06-301-1/+1
| | | |
* | | | Merge topic '16961-xctest-scheme'Brad King2017-06-293-27/+81
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fe34a5c8 Xcode: Add XCTest support to schema generator 690cf2c1 Xcode: Prepare schema generator for XCTest ff3498e7 XCTest: Speed up test by only enabling C language 610d2fce XCTest: Use bundle specific generator expressions Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1013
| * | | | Xcode: Add XCTest support to schema generatorGregor Jasny2017-06-283-7/+62
| | | | | | | | | | | | | | | | | | | | Closes: #16961
| * | | | Xcode: Prepare schema generator for XCTestGregor Jasny2017-06-282-20/+19
| | | | | | | | | | | | | | | | | | | | Issue: #16961
* | | | | Merge topic 'deb-on-windows'Brad King2017-06-296-24/+75
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 52991413 CPackDeb: Enable the DEB generator on Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !979
| * | | | | CPackDeb: Enable the DEB generator on WindowsNils Gladitz2017-06-286-24/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While some features require external Unix tools the generator is mostly portable. By enabling it on Windows it can be used for cross platform packaging.
* | | | | | Merge topic 'vs-link-debug-flags'Brad King2017-06-298-35/+340
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7ba27e36 VS: Add v140 and v141 flag table entries for /DEBUG:NONE and /DEBUG:FULL ae44496e VS: Fix GenerateDebugInformation values for v140 and v141 toolsets 27bef160 VS: Fix GenerateDebugInformation flag map text for v141 toolsets 17a397c2 VS: Split link flag table between v140 and v141 toolsets Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1002
| * | | | | VS: Add v140 and v141 flag table entries for /DEBUG:NONE and /DEBUG:FULLIan Hojnicki2017-06-282-0/+11
| | | | | |
| * | | | | VS: Fix GenerateDebugInformation values for v140 and v141 toolsetsBrad King2017-06-285-30/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When VS 2015 was first released, its new v140 toolset came with a `link.xml` file that changed the `GenerateDebugInformation` boolean (`false` and `true`) value from earlier toolsets to an enumeration consisting of the possible values `No`, `Debug`, and `DebugFastLink`. We first adapted to this in commit v3.4.2~2^2 (VS: Fix VS 2015 .vcxproj file value for GenerateDebugInformation, 2016-01-08), but that broke older toolsets that still expected the boolean. Then commit v3.6.0-rc1~295^2~1 (VS: Fix VS 2015 .vcxproj debug setting for older toolsets, 2016-02-24) added a hack to fix up the value based on the toolset in use. Several follow-up commits fixed this for more older toolsets because our flag table was at the time based on the generator in use rather than the toolset in use. Since commit v3.8.0-rc1~396^2 (VS: Choose flag map based on the toolset name, 2016-10-17) we use a flag table based on the toolset, so the fixup hack should not be needed. We had to keep it around only due to our default value for GenerateDebugInformation (`false` or `No`) still being based on the generator instead of the toolset. A VS 2015 update was released that changed the v140 toolset `link.xml` file back to using `false` and `true` for the `GenerateDebugInformation` enumeration variants previously known as `No` and `Debug`. In order to know which pair to use, we need to parse the `link.xml` file for the current toolset. Switch back to using `false` and `true` unconditionally in our `GenerateDebugInformation` flag table entries and default value. With that plus the toolset-based flag table, we now get incorrect values for `GenerateDebugInformation` only when using a v140 toolset from an older VS 2015 installation. Detect this case by parsing `link.xml` and add special logic to convert `false` and `true` to `No` and `Debug` to satisfy the older toolset specification. Inspired-by: Ian Hojnicki <nullref@live.com> Fixes: #17020
| * | | | | VS: Fix GenerateDebugInformation flag map text for v141 toolsetsIan Hojnicki2017-06-281-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Update the help text to match that from v141's link.xml file.
| * | | | | VS: Split link flag table between v140 and v141 toolsetsIan Hojnicki2017-06-285-6/+291
| | |_|/ / | |/| | |
| * | | | CMake 3.9.0-rc5v3.9.0-rc5Brad King2017-06-271-1/+1
| | | | |
| * | | | Merge branch 'fix-crash-on-non-enabled-language-features' into release-3.9Brad King2017-06-271-2/+19
| |\ \ \ \
| * \ \ \ \ Merge branch 'vs-cuda-fix-flags' into release-3.9Brad King2017-06-271-3/+3
| |\ \ \ \ \
* | | | | | | CMake Nightly Date StampKitware Robot2017-06-291-1/+1
| |_|_|_|/ / |/| | | | |
* | | | | | Merge topic 'feature/include_guard'Brad King2017-06-284-0/+149
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c96f43b7 include_guard: add tests for the feature 80f1221f include_guard: add doc pages and a release note 85b52a04 include_guard: add vim syntax highlighting rules d44bd1c2 include_guard: implement new command Acked-by: Kitware Robot <kwrobot@kitware.com> Reviewed-by: Craig Scott <craig.scott@crascit.com> Merge-request: !928
| * | | | | | include_guard: implement new commandPavel Solodovnikov2017-06-224-0/+149
| | | | | | |
* | | | | | | Merge topic 'fix-windows-ninja-solink'Brad King2017-06-281-4/+12
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 58017517 Ninja: Fix generated command lines for cmake_symlink_* on Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1003
| * | | | | | | Ninja: Fix generated command lines for cmake_symlink_* on WindowsNils Gladitz2017-06-231-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CMake generates multiple commands cojoined with &&. On Windows this only works when executing the commands through the Windows shell.
* | | | | | | | CMake Nightly Date StampKitware Robot2017-06-281-1/+1
| | | | | | | |
* | | | | | | | Merge topic 'vs_csharp_custom_command'Brad King2017-06-272-30/+141
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ec409a11 Vs: fix CSharp custom command by introducing inline MSBuild <Targets>s dcdab5cf Vs: factor out computation of <Link> tag for CSharp source files 0a8f469a Vs: refactor WriteCustomRule for preparation of CSharp support Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !970
| * | | | | | | | Vs: fix CSharp custom command by introducing inline MSBuild <Targets>sMichael Stürmer2017-06-222-6/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The custom command implementation is based on the Microsoft support article: https://docs.microsoft.com/en-us/visualstudio/msbuild/how-to-extend-the-visual-studio-build-process Fixes: #16960
| * | | | | | | | Vs: factor out computation of <Link> tag for CSharp source filesMichael Stürmer2017-06-222-8/+22
| | | | | | | | |
| * | | | | | | | Vs: refactor WriteCustomRule for preparation of CSharp supportMichael Stürmer2017-06-222-18/+34
| | | | | | | | |
* | | | | | | | | Merge topic 'fix-crash-on-non-enabled-language-features'Brad King2017-06-271-2/+19
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e03a1b3b target_compile_features: Do not crash on non-enabled language 86990427 Tests: Enable languages explicitly in RunCMake.target_compile_features Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1010
| * | | | | | | | target_compile_features: Do not crash on non-enabled languageBrad King2017-06-261-2/+19
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | Fixes: #17011