summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* Add CTEST_LABELS_FOR_SUBPROJECTS as a CTest module and script variableBetsy McPhail2017-07-1010-1/+56
| | | | | Use this variable to specify a list of labels that will be reported to CDash as subprojects.
* 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
| * | | | | | CMake 3.9.0-rc4v3.9.0-rc4Brad King2017-06-221-1/+1
| | | | | | |
| * | | | | | Merge branch 'vs-rc-flags' into release-3.9Brad King2017-06-224-0/+4
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'vs-cuda-fix-flags' into release-3.9Brad King2017-06-211-10/+35
| |\ \ \ \ \ \ \
* | \ \ \ \ \ \ \ Merge topic 'vs-cuda-fix-flags'Brad King2017-06-271-3/+3
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bbc1f364 VS: Fix support for nvcc flags not in our flag table Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1007
| * | | | | | | | VS: Fix support for nvcc flags not in our flag tableBrad King2017-06-271-3/+3
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The change in commit v3.9.0-rc4~3^2 (VS: Improve workaround for CUDA -Xcompiler placement bug, 2017-06-21) accidentally appended to the `AdditionalOptions` as if it were a `;`-separated list, but it is actually a command-line string. Append with a space instead. While at it, fix the same problem for the `AdditionalOptions` added to `CudaLink` by commit v3.9.0-rc3~1^2 (CUDA: When linking device code suppress CUDA 8.0+ deprecation warnings, 2017-06-09). Fixes: #17008
* | | | | | | | CMake Nightly Date StampKitware Robot2017-06-271-1/+1
| | | | | | | |
* | | | | | | | Merge topic 'vs_projecttype_comparison'Brad King2017-06-261-23/+26
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 54d42ce7 Vs: disable unnecessary <ItemDefinitionGroups> for CSharp targets d5f7bf9b Vs: change comparison to use .ProjectType member always as first comparator Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !988
| * | | | | | | Vs: disable unnecessary <ItemDefinitionGroups> for CSharp targetsMichael Stürmer2017-06-221-0/+3
| | | | | | | |
| * | | | | | | Vs: change comparison to use .ProjectType member always as first comparatorMichael Stürmer2017-06-221-23/+23
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2017-06-261-1/+1
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2017-06-251-1/+1
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2017-06-241-1/+1
| |_|_|_|/ / / |/| | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2017-06-231-1/+1
| | | | | | |
* | | | | | | Merge topic 'vs-rc-flags'Brad King2017-06-224-0/+4
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | / / / | | |_|/ / / | |/| | | | | | | | | | | | | | | | 974f4333 VS: Fix support for rc /nologo flag in per-source COMPILE_FLAGS Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !998
| * | | | | VS: Fix support for rc /nologo flag in per-source COMPILE_FLAGSBrad King2017-06-224-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.9.0-rc1~160^2 (VS: Use tool-specific flag table for COMPILE_FLAGS parsing, 2017-05-03) we now correctly use the `rc` flag table to process the COMPILE_FLAGS flags of `.rc` source files instead of incorrectly using the `cl` flag table as before. However, our `rc` flag table is not complete. The `/nologo` flag was working before only by accident because the `cl` flag table entry for it happened to match. Add the proper entry to the `rc` flag table. Fixes: #16991
* | | | | | Merge topic 'vs-cuda-fix-flags'Brad King2017-06-221-10/+35
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3b754215 VS: Improve workaround for CUDA -Xcompiler placement bug f2059585 VS: Fix target_compile_options for CUDA Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !996
| * | | | | VS: Improve workaround for CUDA -Xcompiler placement bugBrad King2017-06-211-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit v3.9.0-rc1~431^2~6 (VS: Place CUDA host compiler options in proper project file fields, 2017-03-07) we worked around a bug in the CUDA VS integration by dropping `AdditionalCompilerOptions`. However, this silently drops `-Xcompiler=` options given by the user that don't map to one of CudaCompile's dedicated settings. Improve the workaround to instead put the remaining `AdditionalCompilerOptions` into the `AdditionalOptions` field behind `-Xcompiler=` ourselves.
| * | | | | VS: Fix target_compile_options for CUDABrad King2017-06-211-7/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the VS generator to honor `COMPILE_OPTIONS` for CUDA. The exclusion added by commit v3.9.0-rc1~431^2~7 (VS: Do not pass CUDA compile options to C compiler, 2017-03-07) was correct but we need additional logic to pass the CUDA compile options to the CUDA compiler. Also we should still pass the CXX or C options to MSVC (ClCompile) when those languages are enabled even if the link language is CUDA.
* | | | | | Merge topic 'vs_csharp_link_to_managed_cxx'Brad King2017-06-221-4/+0
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 51865fc6 Vs: allow CSharp targets to be linked to CXX targets Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !993
| * | | | | Vs: allow CSharp targets to be linked to CXX targetsMichael Stürmer2017-06-211-4/+0
| |/ / / / | | | | | | | | | | | | | | | Fixes: #16755
| * | | | Merge branch 'ipo-per-lang' into release-3.9Brad King2017-06-148-20/+28
| |\ \ \ \