summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'clang-cl-no-std'Brad King2017-06-282-29/+61
|\ | | | | | | | | | | | | c67bb5ba Clang: Do not add '-std=' options when simulating MSVC Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !982
| * Clang: Do not add '-std=' options when simulating MSVCRuben Van Boxem2017-06-272-29/+61
| | | | | | | | | | | | | | The `cl.exe` style command line does not accept the `-std=` options. Instead behave like MSVC where we don't define standard levels. Fixes: #16266
* | Merge topic 'feature/include_guard'Brad King2017-06-2828-1/+336
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: add tests for the featurePavel Solodovnikov2017-06-2219-0/+126
| | |
| * | include_guard: add doc pages and a release notePavel Solodovnikov2017-06-223-0/+55
| | |
| * | include_guard: add vim syntax highlighting rulesPavel Solodovnikov2017-06-221-1/+5
| | |
| * | include_guard: implement new commandPavel Solodovnikov2017-06-225-0/+150
| | |
* | | 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.
* | | | Merge topic 'curl-haiku'Brad King2017-06-281-0/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e7936751 curl: Fix build on Haiku Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1006
| * | | | curl: Fix build on HaikuJérôme Duval2017-06-281-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | On Haiku the network functions are in libnetwork, so use it when it exists.
* | | | | Merge topic 'docs_CheckXXXSourceYYY'Brad King2017-06-285-129/+298
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 63fc3bff Check*Source{Compiles,Runs}: Rewrite docs for these modules Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1005
| * | | | | Check*Source{Compiles,Runs}: Rewrite docs for these modulesCraig Scott2017-06-245-129/+298
| | |/ / / | |/| | |
* | | | | Merge topic 'document_CMAKE_MSVCIDE_RUN_PATH'Brad King2017-06-282-0/+11
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | adbd1468 Help: Document the CMAKE_MSVCIDE_RUN_PATH variable. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1011
| * | | | | Help: Document the CMAKE_MSVCIDE_RUN_PATH variable.Robert Maynard2017-06-272-0/+11
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2017-06-281-1/+1
| | | | | |
* | | | | | Merge branch 'release-3.9'Brad King2017-06-270-0/+0
|\ \ \ \ \ \
| * | | | | | CMake 3.9.0-rc5v3.9.0-rc5Brad King2017-06-271-1/+1
| | | | | | |
* | | | | | | Merge branch 'release-3.9'Brad King2017-06-270-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch 'FindDoxygen-internal-var' into release-3.9Brad King2017-06-271-6/+6
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge topic 'FindDoxygen-internal-var'Brad King2017-06-271-6/+6
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d194bd91 FindDoxygen: Add private prefix to internal variables Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1012
| * | | | | | | FindDoxygen: Add private prefix to internal variablesBrad King2017-06-271-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.9.0-rc1~55^2 (Improve Doxygen support, 2017-04-10) we accidentally leave a non-prefixed internal `result` variable set. This may interfere with project code. Add a prefix to avoid this.
* | | | | | | | Merge branch 'release-3.9'Brad King2017-06-270-0/+0
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge branch 'fix-crash-on-non-enabled-language-features' into release-3.9Brad King2017-06-2727-14/+49
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'vs-cuda-fix-flags' into release-3.9Brad King2017-06-272-3/+8
| |\ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ Merge topic 'vs_csharp_custom_command'Brad King2017-06-279-30/+224
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-229-6/+170
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'FindCUDA-no-empty-genex'Brad King2017-06-271-0/+2
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a3e442bb FindCUDA: Fix CUDA_NVCC_FLAGS_<CONFIG> for separable compilation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1008
| * | | | | | | | | | | FindCUDA: Fix CUDA_NVCC_FLAGS_<CONFIG> for separable compilationRobert Maynard2017-06-261-0/+2
| | |_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.0.0-rc6~3^2 (FindCUDA: Use CUDA_NVCC_FLAGS* for separable compilation, 2014-05-18), using the feature for one configuration results in empty-string ("") arguments on the command line for other configurations. This is because the generator expression for a non-matching configuration evaluates to an empty string but does not remove the argument. Use `COMMAND_EXPAND_LISTS` to remove the empty arguments from the custom command after genex evaluation. Fixes: #16411
* | | | | | | | | | | Merge topic 'FindCUDA-no-find_host_program'Brad King2017-06-271-1/+5
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 46d25e78 FindCUDA: Use find_program if find_host_program is not available Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1009
| * | | | | | | | | | | FindCUDA: Use find_program if find_host_program is not availableMaxime Roussin-Bélanger2017-06-261-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CMake does not define the `find_host_program` command we've been using in the cross-compiling code path. It was provided by a widely used Android toolchain file. For compatibility, continue to use `find_host_program` if available, but otherwise use just `find_program`. Fixes: #16509
* | | | | | | | | | | | Merge topic 'fix-crash-on-non-enabled-language-features'Brad King2017-06-2727-14/+49
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-265-2/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #17011
| * | | | | | | | | | | Tests: Enable languages explicitly in RunCMake.target_compile_featuresBrad King2017-06-2622-12/+22
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable C or CXX (or nothing) as needed in each test case. This will allow us to add test cases that do not enable CXX.
* | | | | | | | | | | Merge topic 'vs-cuda-fix-flags'Brad King2017-06-272-3/+8
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-272-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 branch 'release-3.9'Brad King2017-06-260-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | |
| * | | | | | | | | Merge branch 'GetPrerequisites-ucrt-no-warn' into release-3.9Brad King2017-06-261-1/+1
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'toolchain-binutils-advanced' into release-3.9Brad King2017-06-222-0/+4
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | 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
| | | | | | | | | | |
* | | | | | | | | | | Merge topic 'toolchain-binutils-advanced'Brad King2017-06-262-0/+4
|\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 04b2fc08 GCC,Clang: Mark CMAKE_<LANG>_COMPILER_{AR,RANLIB} as advanced Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1001
| * | | | | | | | | | GCC,Clang: Mark CMAKE_<LANG>_COMPILER_{AR,RANLIB} as advancedBrad King2017-06-222-0/+4
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge topic 'GetPrerequisites-ucrt-no-warn'Brad King2017-06-261-1/+1
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | / / / / / | |_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | 23451a66 GetPrerequisites: Do not warn about non-absolute UCRT system libraries Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !999
| * | | | | | | | GetPrerequisites: Do not warn about non-absolute UCRT system librariesBrad King2017-06-261-1/+1
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Issue: #17007
* | | | | | | | CMake Nightly Date StampKitware Robot2017-06-261-1/+1
| | | | | | | |