Commit Graph

20803 Commits

Author SHA1 Message Date
Kitware Robot 7bfbcc75a3 CMake Nightly Date Stamp 2016-07-22 00:01:03 -04:00
Brad King dbc0ec1648 Merge topic 'makefile-response-files'
c7a7c655 Makefile: Avoid link line object list lengths nearing system limits
34ba5c53 Makefile: Factor out response file checks into common helper
2016-07-21 11:27:31 -04:00
Brad King 850764fc70 Merge topic 'vs-alternate-RootNamespace'
8aa97fba VS: Handle VS_GLOBAL_RootNamespace special case
2016-07-21 10:39:10 -04:00
Brad King e297e0455e Merge topic 'ninja-target-deps'
1296a0ea Ninja: Fix inter-target order-only dependencies of custom commands
2016-07-21 10:39:07 -04:00
Brad King a4498cc9ae Merge topic 'update-kwsys'
e9849d35 bootstrap: Add check for ext/stdio_filebuf.h needed by KWSys
51d9e8ae Merge branch 'upstream-KWSys' into update-kwsys
9ef2b2b1 KWSys 2016-07-19 (9d1dbd95)
2016-07-21 10:39:01 -04:00
Kitware Robot 811bcf543c CMake Nightly Date Stamp 2016-07-21 00:01:03 -04:00
Brad King c7a7c655f0 Makefile: Avoid link line object list lengths nearing system limits
Use response files for object file lists that approach the scale of the
system `ARG_MAX` limit.

Fixes #16206.
2016-07-20 15:09:42 -04:00
Brad King 34ba5c5348 Makefile: Factor out response file checks into common helper
Factor CMAKE_<LANG>_USE_RESPONSE_FILE_FOR_{OBJECTS,LIBRARIES} lookup out
into a common helper.  Use a separate helper for each because more
specific logic may be added to each later.
2016-07-20 15:00:56 -04:00
Brad King 1296a0eada Ninja: Fix inter-target order-only dependencies of custom commands
Custom command dependencies are followed for each target's source files
and add their transitive closure to the corresponding target.  This
means that when a custom command in one target has a dependency on a
custom command in another target, both will appear in the dependent
target's sources.  For the Makefile, VS IDE, and Xcode generators this
is not a problem because each target gets its own independent build
system that is evaluated in target dependency order.  By the time the
dependent target is built the custom command that belongs to one of its
dependencies will already have been brought up to date.

For the Ninja generator we need to generate a monolithic build system
covering all targets so we can have only one copy of a custom command.
This means that we need to reconcile the target-level ordering
dependencies from its appearance in multiple targets to include only the
least-dependent common set.  This is done by computing the set
intersection of the dependencies of all the targets containing a custom
command.  However, we previously included only the direct dependencies
so any target-level dependency not directly added to all targets into
which a custom command propagates was discarded.

Fix this by computing the transitive closure of dependencies for each
target and then intersecting those sets.  That will get the common set
of dependencies.  Also add a test to cover a case in which the
incorrectly dropped target ordering dependencies would fail.
2016-07-20 13:12:24 -04:00
Benjamin Ballet 8aa97fba9e VS: Handle VS_GLOBAL_RootNamespace special case
Although we provide a `VS_GLOBAL_ROOTNAMESPACE` option to both set
the `RootNamespace` value and reference it, some users may try to
set `VS_GLOBAL_RootNamespace` to set `RootNamespace` as a variant
of the `VS_GLOBAL_<variable>` property.  In this case we still
need to add the reference to `$(RootNamespace)`.
2016-07-20 11:34:47 -04:00
Brad King 51d9e8ae3e Merge branch 'upstream-KWSys' into update-kwsys
* upstream-KWSys:
  KWSys 2016-07-19 (9d1dbd95)
2016-07-20 09:05:17 -04:00
Brad King df14a98e9c Merge topic 'update-kwsys'
788bb146 Merge branch 'upstream-KWSys' into update-kwsys
eb7b5087 KWSys 2016-07-18 (19732229)
2016-07-20 09:03:42 -04:00
Brad King 6a98785d8f Merge topic 'compat-CPACK_INSTALL_CMAKE_PROJECTS-subdirectory'
57534990 CPack: Add compatibility for incorrect CPACK_INSTALL_CMAKE_PROJECTS value
2016-07-20 09:03:22 -04:00
Kitware Robot 88ee36f93f CMake Nightly Date Stamp 2016-07-20 00:01:04 -04:00
Brad King 57534990d8 CPack: Add compatibility for incorrect CPACK_INSTALL_CMAKE_PROJECTS value
Since commit v3.6.0-rc1~339^2 (CPack: Fix CPACK_INSTALL_CMAKE_PROJECTS
SubDirectory (4th) option, 2016-02-18) we now honor the "Directory"
option of this variable.  Prior to that commit the value was not used
so projects may have used a placeholder value like `.` instead of `/`.
Treat `.` the same as `/` to restore compatibility with such projects.

Fixes #16205.
2016-07-19 10:07:12 -04:00
Brad King 788bb14664 Merge branch 'upstream-KWSys' into update-kwsys
* upstream-KWSys:
  KWSys 2016-07-18 (19732229)
2016-07-19 08:27:19 -04:00
Brad King 34216023e6 Merge topic 'use-better-KWSys-GetEnv'
b1f87a50 Use better KWSys SystemTools::GetEnv and HasEnv signatures
2016-07-19 08:26:05 -04:00
Brad King 6a44e34630 Merge topic 'update-kwsys'
03407040 Merge branch 'upstream-KWSys' into update-kwsys
bbb3216a KWSys 2016-07-15 (f396bf43)
2016-07-19 08:26:01 -04:00
Kitware Robot 34efc0a539 CMake Nightly Date Stamp 2016-07-19 00:01:09 -04:00
Dāvis Mosāns b1f87a50b3 Use better KWSys SystemTools::GetEnv and HasEnv signatures 2016-07-18 09:51:01 -04:00
Brad King 03407040d4 Merge branch 'upstream-KWSys' into update-kwsys
* upstream-KWSys:
  KWSys 2016-07-15 (f396bf43)
2016-07-18 09:28:42 -04:00
Brad King 8a5472bd2f Merge topic 'vs-natvis'
a6290cff VS: Add support for NATVIS files
2016-07-18 08:57:33 -04:00
Brad King d0be658205 Merge topic 'ninja-no-accidental-rsp'
86dd2427 Ninja: Do not force response files when no sysconf(3) limit is used
2016-07-18 08:57:30 -04:00
Brad King b224f43120 Merge topic 'ninja-portable-arg-max'
5ec17e61 Ninja: Generalize check for sysconf(3) call
2016-07-18 08:57:26 -04:00
Kitware Robot d290751d0e CMake Nightly Date Stamp 2016-07-18 00:01:03 -04:00
Kitware Robot 3cf455ba3d CMake Nightly Date Stamp 2016-07-17 00:01:04 -04:00
Kitware Robot 5642349129 CMake Nightly Date Stamp 2016-07-16 00:01:04 -04:00
Robert Dailey a6290cffae VS: Add support for NATVIS files
Add an explicit `<Natvis>` element in VS project files for `*.natvis`
files.  These enable custom debug visualizers for project-specific
types.

Fixes #16043.
2016-07-15 10:36:21 -04:00
Raphael Kubo da Costa 5ec17e6106 Ninja: Generalize check for sysconf(3) call
Use `sysconf(_SC_ARG_MAX)` wherever `_SC_ARG_MAX` is available instead
of hard-coding an incomplete list of operating systems that implement
it.  In particular, it is available on BSD platforms that were not
previously listed.
2016-07-15 09:50:59 -04:00
Brad King 86dd2427bc Ninja: Do not force response files when no sysconf(3) limit is used
Commit v3.6.0-rc1~174^2~1 (cmGlobalNinjaGenerator: Clarify logic for
forcing use of response files, 2016-04-06) started using negative
command line length values to represent forced use of response files but
forgot to update `calculateCommandLineLengthLimit()` accordingly.  Teach
it to return `0` instead of `-1` when no limit is computed from the
system to avoid forcing response files.

Reported-by: Raphael Kubo da Costa <rakuco@FreeBSD.org>
2016-07-15 09:43:02 -04:00
Brad King c59ec2b7c8 Merge topic 'cmake-internal-info'
4db08807 CMake: Report whether generators support platforms
43a68a6d cmGlobalGeneratorFactory: Use CM_OVERRIDE for all derived classes
af0e1cd4 Make CMake version dirty state available to code
6a077b5d Make CMake version suffix available to code
2016-07-15 09:04:24 -04:00
Kitware Robot 0c3fc5a251 CMake Nightly Date Stamp 2016-07-15 00:01:03 -04:00
Tobias Hunger 4db08807db CMake: Report whether generators support platforms 2016-07-14 10:35:58 -04:00
Tobias Hunger 43a68a6dca cmGlobalGeneratorFactory: Use CM_OVERRIDE for all derived classes 2016-07-14 10:35:58 -04:00
Tobias Hunger af0e1cd4cb Make CMake version dirty state available to code
Set `CMake_VERSION_IS_DIRTY` to 1 or 0 depending on whether the CMake
source tree is considered dirty or not.
2016-07-14 10:35:58 -04:00
Tobias Hunger 6a077b5d63 Make CMake version suffix available to code
Make the string (e.g. "rc1" or "gSHA-dirty") available to the code.
2016-07-14 10:27:17 -04:00
Brad King 2fe520d2b0 Merge topic 'cmake-ifw-package-updates'
2aadb02f QtIFW: Don't show component selection page if it don't need
53992808 QtIFW: process USE_LGPL when CMake_INSTALL_COMPONENTS
8ae035a5 CMake: install COMPONENT cmcldeps
2016-07-14 09:24:00 -04:00
Brad King 4d3d28750e Merge topic 'vs14-debug-enum-older-toolsets'
36fc3a53 VS: Fix VS 2015 .vcxproj debug setting for v90 toolset (#15986)
2016-07-14 09:23:45 -04:00
Kitware Robot 59f23193a7 CMake Nightly Date Stamp 2016-07-14 00:01:03 -04:00
Konstantin Podsvirov 2aadb02f83 QtIFW: Don't show component selection page if it don't need 2016-07-13 10:02:12 -04:00
Konstantin Podsvirov 8ae035a569 CMake: install COMPONENT cmcldeps
Added in Tools group with IFW installer
2016-07-13 10:02:12 -04:00
Brad King 36fc3a5372 VS: Fix VS 2015 .vcxproj debug setting for v90 toolset (#15986) 2016-07-13 09:35:39 -04:00
Brad King de1f409844 Merge topic 'no-export-cmake-version'
c376c5bc Do not place CMake version in export files
2016-07-13 09:26:50 -04:00
Brad King 7f36d89595 Merge topic 'fix-cmake-E-env_vs8_wince'
047862d3 cmake: Fix -E env_vs8_wince implementation
b7a94fbb cmake: Drop unused -E cmake_call_visual_studio_macro code
2016-07-13 09:26:47 -04:00
Brad King 602d95d16d Merge topic 'find-command-restore-PATH-on-unix'
54475018 Restore find_(library|file|path) search of PATH itself
2016-07-13 09:26:37 -04:00
Brad King 40f24f0ec2 Merge topic 'windows-export-all-from-exe'
9da725cb Windows: Honor WINDOWS_EXPORT_ALL_SYMBOLS for executables with exports
2005b960 Makefile: Factor out WINDOWS_EXPORT_ALL_SYMBOLS helper
2016-07-13 09:26:33 -04:00
Brad King 43875ca59c Merge topic 'cmake-spelling'
56608618 Fix typos.
2016-07-13 09:26:30 -04:00
Kitware Robot 056db896e3 CMake Nightly Date Stamp 2016-07-13 00:01:03 -04:00
Kitware Robot 49f5818d8a CMake Nightly Date Stamp 2016-07-12 00:01:04 -04:00
Brad King 047862d391 cmake: Fix -E env_vs8_wince implementation
This code has accidentally not been compiled since commit
v3.0.0-rc1~556^2 (cmake: Split -E command implementation into separate
source file, 2013-10-03) because CMAKE_HAVE_VS_GENERATORS was local to
`cmake.cxx`.

Fixes #16195.
2016-07-11 14:44:38 -04:00