Commit Graph

36355 Commits

Author SHA1 Message Date
Brad King
7b02cb2996 cmCommonTargetGenerator: Rename member to avoid shadowing
Rename the `LocalGenerator` and `GlobalGenerator` members to avoid
shadowing similar members in subclasses that use more-specific pointer
types.
2017-06-14 16:31:20 -04:00
Brad King
c1f15e1c79 cmGlobalGenerator: Rename member to avoid shadowing
The `CurrentMakefile` member is shadowed by a generate-time member of
the same name in `cmGlobalXCodeGenerator`.  Rename our member to clarify
its configure-time role and avoid the shadow.
2017-06-14 16:24:45 -04:00
Brad King
877e7383b3 Merge branch 'release-3.9' 2017-06-14 15:11:15 -04:00
Brad King
fdacfc6604 Merge branch 'add-missing-compiler-release-notes' into release-3.9 2017-06-14 15:10:12 -04:00
Brad King
a7cbc5f245 Merge topic 'add-missing-compiler-release-notes'
28756437 Help: Add docs for new compilers supporting language standards.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !966
2017-06-14 14:12:47 -04:00
Brad King
c8b4da5838 Merge topic 'vs-dotnet-custom-reference-tags'
07ec212a VS: add target property VS_DOTNET_REFERENCEPROP_<refname>_TAG_<tagname>

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !960
2017-06-14 12:43:34 -04:00
Chuck Atkins
28756437f2 Help: Add docs for new compilers supporting language standards. 2017-06-14 11:54:58 -04:00
Brad King
b0835fefd2 Merge topic 'autogen_uc'
7f68ad66 Autogen: Tests: Disable some tests on non ASCII build paths
38e3fc4b Autogen: Tests fix for utf8 paths

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !959
2017-06-14 11:49:28 -04:00
Brad King
cbc7d2435e Merge topic 'readme-supported-platforms'
bf2e4bfb README: Update list of supported platforms

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !962
2017-06-14 11:49:06 -04:00
Kitware Robot
3c40207a10 CMake Nightly Date Stamp 2017-06-14 00:01:05 -04:00
Brad King
14c82d14bc Merge branch 'readme-supported-platforms' into release-3.9 2017-06-13 13:10:59 -04:00
Brad King
bf2e4bfbaa README: Update list of supported platforms
Convert to a bullet list.  Drop platforms for which we no longer have
nightly testing.
2017-06-13 13:05:51 -04:00
Brad King
52b10ca882 Merge branch 'release-3.9' 2017-06-13 11:09:53 -04:00
Sebastian Holtermann
7f68ad6612 Autogen: Tests: Disable some tests on non ASCII build paths 2017-06-13 16:51:33 +02:00
Michael Stürmer
07ec212ae8 VS: add target property VS_DOTNET_REFERENCEPROP_<refname>_TAG_<tagname>
Fixes: #16689
2017-06-13 10:46:31 -04:00
Brad King
c52b982da6 CMake 3.9.0-rc3 2017-06-13 09:59:27 -04:00
Brad King
4e23a1d0eb Merge branch 'release-3.9' 2017-06-13 09:29:39 -04:00
Brad King
9203aff851 Merge topic 'android-unified-headers'
3d00be13 Android: Add support for unified headers

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !956
2017-06-13 09:27:17 -04:00
Brad King
6733d602af Merge topic 'remove-stray-line'
ae77d976 cmGlobalGenerator: Remove unused line

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !955
2017-06-13 09:20:54 -04:00
Brad King
5f704d992d Merge topic 'doc-pkgconfig-list'
70a6cb70 FindPkgConfig: mention that variables will be ;-lists
6610fdbe FindPkgConfig: fix confusing indentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !957
2017-06-13 09:20:34 -04:00
Brad King
087b8ccda9 Merge topic 'cuda-dlink-no-deprecated-gpu'
7368ade2 CUDA: When linking device code suppress CUDA 8.0+ deprecation warnings

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !951
2017-06-13 09:18:19 -04:00
Brad King
fb99b0b87b Merge branch 'cuda-dlink-no-deprecated-gpu' into release-3.9 2017-06-13 09:17:06 -04:00
Robert Maynard
7368ade250 CUDA: When linking device code suppress CUDA 8.0+ deprecation warnings
The CUDA compiler automatic deprecation warnings are pure noise when
doing device linking, and should be suppressed to reduce the amount of
confusion from users.
2017-06-13 09:15:19 -04:00
Kitware Robot
4ba2d2e3d7 CMake Nightly Date Stamp 2017-06-13 00:01:05 -04:00
Brad King
70ec0f2ad1 Merge branch 'doc-pkgconfig-list' into release-3.9 2017-06-12 16:24:50 -04:00
Rolf Eike Beer
70a6cb70f6 FindPkgConfig: mention that variables will be ;-lists 2017-06-12 22:03:20 +02:00
Rolf Eike Beer
6610fdbed2 FindPkgConfig: fix confusing indentation 2017-06-12 22:03:20 +02:00
Sebastian Holtermann
38e3fc4bdd Autogen: Tests fix for utf8 paths 2017-06-12 21:54:45 +02:00
Brad King
05789144bd Merge branch 'android-unified-headers' into release-3.9 2017-06-12 12:59:23 -04:00
Brad King
3d00be13ee Android: Add support for unified headers
The unified headers are preferred as of NDK r15, so use them by default
if available and provide an option to use the deprecated headers.

Inspired-by: Florent Castelli <florent.castelli@gmail.com>
Fixes: #16584
2017-06-12 11:47:30 -04:00
Brad King
ee47d80c3b Merge branch 'release-3.9' 2017-06-12 10:42:17 -04:00
Brad King
f6ed92280c Merge topic 'android-standalone-no-sysroot-include'
22f8a465 Android: Do not pass sysroot include for standalone toolchain

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !952
2017-06-12 10:23:22 -04:00
Brad King
637ff39d45 Merge topic 'android-standalone-unified-api-level'
5f93bf78 Android: Detect API version of standalone toolchain with unified headers

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !950
2017-06-12 10:23:06 -04:00
Brad King
00b91b1530 Merge topic 'execute_process-pipeline-results'
d6051ca3 execute_process: Add option to get results of every child

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !702
2017-06-12 10:22:12 -04:00
Brad King
0cb8730c0b Merge topic 'cpack-freebsd-pkg'
2042cae9 CPack-FreeBSD: add a generator for FreeBSD pkg(8)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !693
2017-06-12 10:21:42 -04:00
Brad King
99153a9eb6 Merge topic 'cuda-compiler-launcher'
414438b2 CUDA: Add option to run the compiler through launcher tools

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !949
2017-06-12 10:20:58 -04:00
Brad King
22b412c325 Merge topic 'FindHTMLHelp-path-suffixes'
fcbecbd2 FindHTMLHelp: Use PATH_SUFFIXES to search under Program Files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !948
2017-06-12 10:20:23 -04:00
Brad King
aa9d0afc52 Merge topic 'update-kwsys'
3d1c3e0d Merge branch 'upstream-KWSys' into update-kwsys
a3275878 KWSys 2017-06-09 (a700e2ab)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !947
2017-06-12 10:19:23 -04:00
Brad King
cb1fdb301e Merge topic 'file-generate-relative-paths'
82be694c file(GENERATE): Add policy CMP0070 to define relative path behavior
69050f4d Tests: Use full output paths in file(GENERATE) calls

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !943
2017-06-12 10:15:47 -04:00
Brad King
ae77d9768f cmGlobalGenerator: Remove unused line
Remove an unused line that was left by commit v2.4.0~3946 (set
CMAKE_SYSTEM_VERSION for windows, 2003-07-16).

Fixes: #16956
2017-06-12 10:01:31 -04:00
Kitware Robot
abd1216c1f CMake Nightly Date Stamp 2017-06-12 00:01:04 -04:00
Kitware Robot
200fdf272f CMake Nightly Date Stamp 2017-06-11 00:01:04 -04:00
Adam Weisi
d6051ca39e execute_process: Add option to get results of every child
Add a `RESULTS_VARIABLE` option to get the results of all children
in a pipeline of one or more `COMMAND`s.
2017-06-10 08:03:06 -04:00
Adriaan de Groot
2042cae9a5 CPack-FreeBSD: add a generator for FreeBSD pkg(8)
Adds an option CPACK_ENABLE_FREEBSD_PKG to allow CPack to look
for FreeBSD's libpkg / pkg(8). If this is set and the libpkg
headers and library are found (which they will be, by default,
on any FreeBSD system), then add a FreeBSD pkg(8) generator.

The FreeBSD package tool pkg(8) uses tar.xz files (.txz) with two
metadata files embedded (+MANIFEST and +COMPACT_MANIFEST).
This introduces a bunch of FreeBSD-specific CPACK_FREEBSD_PACKAGE_*
variables for filling in the metadata; the Debian generator does
something similar. Documentation for the CPack CMake-script is styled
after the Debian generator.

Implementation notes:
 - Checks for libpkg -- the underlying implementation for pkg(8) --
   and includes FreeBSD package-generation if building CMake on
   a UNIX host. Since libpkg can be used on BSDs, Linux and OSX,
   this potentially adds one more packaging format. In practice,
   this will only happen on FreeBSD and DragonflyBSD.
 - Copy-paste from cmCPackArchiveGenerator to special-case
   the metadata generation and to run around the internal
   archive generation: use libpkg instead.
 - Generating the metadata files is a little contrived.
 - Most of the validation logic for package settings is in
   CPackFreeBSD.cmake, as well as the code that tries to re-use
   packaging settings that may already be set up for Debian.
 - libpkg has its own notion of output filename, so we have
   another contrived bit of code that munges the output file
   list so that CPack can find the output.
 - Stick with C++98.
2017-06-10 07:53:59 -04:00
Kitware Robot
c3868cf90c CMake Nightly Date Stamp 2017-06-10 00:01:10 -04:00
Brad King
a131316a95 Merge branch 'android-standalone-no-sysroot-include' into release-3.9 2017-06-09 16:42:13 -04:00
Brad King
22f8a465d7 Android: Do not pass sysroot include for standalone toolchain
The change in commit v3.8.0-rc1~60^2 (Android: Pass sysroot include
directory explicitly, 2017-01-20) does not make sense when compiling
with a standalone toolchain which is tied to a single API version.
Drop the explicit include directory so that the compiler uses its
default system include order.

Fixes: #16954
2017-06-09 16:28:32 -04:00
Brad King
f83d3e3f2c Merge branch 'android-standalone-unified-api-level' into release-3.9 2017-06-09 14:20:09 -04:00
Brad King
5f93bf787d Android: Detect API version of standalone toolchain with unified headers
A standalone toolchain with unified headers keeps the `__ANDROID_API__`
macro in the `bin/clang` launcher instead of in `api-level.h`.

Issue: #16954
2017-06-09 14:19:52 -04:00
Brad King
414438b2fb CUDA: Add option to run the compiler through launcher tools
Add a `CUDA_COMPILER_LAUNCHER` target property like those added for C
and CXX by commit v3.4.0-rc1~450^2 (Add options to launch the compiler
through tools like ccache or distcc, 2015-06-04).

Fixes: #16953
2017-06-09 12:34:39 -04:00