reactos/CMake
1
0
Fork 0
mirror of https://github.com/reactos/CMake.git synced 2025-03-07 11:27:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
36,588 Commits 4 Branches 185 Tags
Commit Graph

36588 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kitware Robot
9ab399ba82 CMake Nightly Date Stamp 2017-06-28 00:01:06 -04:00
Robert Maynard
adbd1468cb Help: Document the CMAKE_MSVCIDE_RUN_PATH variable. 2017-06-27 13:52:11 -04:00
Ruben Van Boxem
c67bb5bae3 Clang: Do not add '-std=' options when simulating MSVC 
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
 2017-06-27 13:04:41 -04:00
Brad King
1e34b42e71 Merge branch 'release-3.9' 2017-06-27 11:57:54 -04:00
Brad King
372de3f803 CMake 3.9.0-rc5 v3.9.0-rc5 2017-06-27 10:59:58 -04:00
Brad King
4d623861c5 Merge branch 'release-3.9' 2017-06-27 10:59:03 -04:00
Brad King
f7cc2cc2b6 Merge topic 'FindDoxygen-internal-var' 
d194bd91 FindDoxygen: Add private prefix to internal variables

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1012
 2017-06-27 10:54:25 -04:00
Brad King
7f1fd07b19 Merge branch 'FindDoxygen-internal-var' into release-3.9 2017-06-27 10:48:30 -04:00
Brad King
d194bd915b FindDoxygen: Add private prefix to internal variables 
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.
 2017-06-27 10:45:45 -04:00
Brad King
b43d0fd04b Merge branch 'release-3.9' 2017-06-27 09:23:18 -04:00
Brad King
126effbb9c Merge topic 'vs_csharp_custom_command' 
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
 2017-06-27 09:21:38 -04:00
Brad King
4fd6507a52 Merge topic 'FindCUDA-no-empty-genex' 
a3e442bb FindCUDA: Fix CUDA_NVCC_FLAGS_<CONFIG> for separable compilation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1008
 2017-06-27 09:21:15 -04:00
Brad King
33d6145f87 Merge topic 'FindCUDA-no-find_host_program' 
46d25e78 FindCUDA: Use find_program if find_host_program is not available

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1009
 2017-06-27 09:20:51 -04:00
Brad King
43c3afa745 Merge topic 'fix-crash-on-non-enabled-language-features' 
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
 2017-06-27 09:20:32 -04:00
Brad King
dc11a20d7b Merge topic 'vs-cuda-fix-flags' 
bbc1f364 VS: Fix support for nvcc flags not in our flag table

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1007
 2017-06-27 09:18:34 -04:00
Brad King
fd771df773 Merge branch 'fix-crash-on-non-enabled-language-features' into release-3.9 2017-06-27 09:14:31 -04:00
Brad King
1d86103846 Merge branch 'vs-cuda-fix-flags' into release-3.9 2017-06-27 09:14:26 -04:00
Brad King
bbc1f3642c VS: Fix support for nvcc flags not in our flag table 
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
 2017-06-27 09:08:50 -04:00
Kitware Robot
b8858bd404 CMake Nightly Date Stamp 2017-06-27 00:01:07 -04:00
Robert Maynard
a3e442bbfc FindCUDA: Fix CUDA_NVCC_FLAGS_<CONFIG> for separable compilation 
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
 2017-06-26 14:59:05 -04:00
Brad King
e03a1b3b61 target_compile_features: Do not crash on non-enabled language 
Fixes: #17011
 2017-06-26 13:54:20 -04:00
Brad King
869904271b Tests: Enable languages explicitly in RunCMake.target_compile_features 
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.
 2017-06-26 13:54:20 -04:00
Maxime Roussin-Bélanger
46d25e782e FindCUDA: Use find_program if find_host_program is not available 
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
 2017-06-26 13:10:54 -04:00
Brad King
6c363f5caf Merge branch 'release-3.9' 2017-06-26 10:52:35 -04:00
Brad King
4d0155e780 Merge topic 'vs_projecttype_comparison' 
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
 2017-06-26 10:45:11 -04:00
Brad King
a52ecd983f Merge topic 'toolchain-binutils-advanced' 
04b2fc08 GCC,Clang: Mark CMAKE_<LANG>_COMPILER_{AR,RANLIB} as advanced

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1001
 2017-06-26 10:42:36 -04:00
Brad King
b93a69e6d1 Merge topic 'GetPrerequisites-ucrt-no-warn' 
23451a66 GetPrerequisites: Do not warn about non-absolute UCRT system libraries

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !999
 2017-06-26 10:42:10 -04:00
Brad King
c24e665613 Merge branch 'GetPrerequisites-ucrt-no-warn' into release-3.9 2017-06-26 10:34:02 -04:00
Brad King
23451a66ac GetPrerequisites: Do not warn about non-absolute UCRT system libraries 
Issue: #17007
 2017-06-26 10:33:16 -04:00
Kitware Robot
581fda598c CMake Nightly Date Stamp 2017-06-26 00:01:04 -04:00
Kitware Robot
78f879f418 CMake Nightly Date Stamp 2017-06-25 00:01:04 -04:00
Craig Scott
63fc3bff4d Check*Source{Compiles,Runs}: Rewrite docs for these modules 2017-06-24 20:09:16 +10:00
Kitware Robot
2731edf978 CMake Nightly Date Stamp 2017-06-24 00:01:04 -04:00
Nils Gladitz
5801751709 Ninja: Fix generated command lines for cmake_symlink_* on Windows 
CMake generates multiple commands cojoined with &&.
On Windows this only works when executing the commands through
the Windows shell.
 2017-06-23 10:58:39 +02:00
Kitware Robot
4c7caf15e4 CMake Nightly Date Stamp 2017-06-23 00:01:06 -04:00
Michael Stürmer
ec409a116f Vs: fix CSharp custom command by introducing inline MSBuild <Targets>s 
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
 2017-06-22 21:40:48 +02:00
Michael Stürmer
dcdab5cf23 Vs: factor out computation of <Link> tag for CSharp source files 2017-06-22 21:39:37 +02:00
Brad King
319bd92589 Merge branch 'toolchain-binutils-advanced' into release-3.9 2017-06-22 14:15:09 -04:00
Brad King
4d9ac96f28 Merge topic 'doc-dev-maint' 
420e4844 Help/dev: Update maintainer guide with note about docs and tests

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1000
 2017-06-22 11:57:32 -04:00
Brad King
04b2fc08b4 GCC,Clang: Mark CMAKE_<LANG>_COMPILER_{AR,RANLIB} as advanced 2017-06-22 11:33:54 -04:00
Brad King
8b2ab97709 Merge branch 'release-3.9' 2017-06-22 11:23:32 -04:00
Brad King
420e48442b Help/dev: Update maintainer guide with note about docs and tests 2017-06-22 11:02:05 -04:00
Michael Stürmer
0a8f469af9 Vs: refactor WriteCustomRule for preparation of CSharp support 2017-06-22 16:52:37 +02:00
Michael Stürmer
54d42ce728 Vs: disable unnecessary <ItemDefinitionGroups> for CSharp targets 2017-06-22 16:51:44 +02:00
Michael Stürmer
d5f7bf9b2e Vs: change comparison to use .ProjectType member always as first comparator 2017-06-22 16:49:24 +02:00
Brad King
8fe54172fc CMake 3.9.0-rc4 v3.9.0-rc4 2017-06-22 10:15:07 -04:00
Brad King
298272681c Merge branch 'release-3.9' 2017-06-22 10:14:17 -04:00
Brad King
426c83cf8f Merge topic 'vs-rc-flags' 
974f4333 VS: Fix support for rc /nologo flag in per-source COMPILE_FLAGS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !998
 2017-06-22 10:13:39 -04:00
Brad King
751f0e0adc Merge topic 'android-unified-headers' 
5d317930 Android: Fix include path for unified headers

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !997
 2017-06-22 10:12:59 -04:00
Brad King
396b618c52 Merge topic 'vs-cuda-fix-flags' 
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
 2017-06-22 10:04:37 -04:00