Commit Graph
28539 Commits
Author SHA1 Message Date
Daniel Pfeifer 765822add7 cmake: pass cmStateSnapshot by const ref 2017-04-21 21:55:04 +02:00
Daniel Pfeifer 0d0995b7f8 cmListFileArgument: remove custom copy ctor 2017-04-21 21:50:45 +02:00
Daniel Pfeifer 44963b509b cmLocaleRAII: make noncopyable 2017-04-21 21:46:58 +02:00
Daniel Pfeifer 3f677f2076 cmGraphEdge: remove custom copy ctor
Also, merge the other ctors using default args.
2017-04-21 21:42:45 +02:00
Daniel Pfeifer b799ca42b8 cmAlgorithms: pass std::string by const ref 2017-04-21 21:40:54 +02:00
Brad King 627288fe23 Merge branch 'backport-source_group-TREE-alt-root' into release 2017-04-21 15:36:58 -04:00
Daniel Pfeifer 7d6090aec4 cmSystemTools::SaveRestoreEnvironment: make noncopyable
Also, make the destructor non-virtual.
2017-04-21 21:36:32 +02:00
Brad King d286d24af3 Merge branch 'backport-source_group-TREE-alt-root' into source_group-TREE-alt-root 2017-04-21 15:36:17 -04:00
Daniel Pfeifer aecba65241 cmCLocaleEnvironmentScope: make noncopyable 2017-04-21 21:33:22 +02:00
Mateusz Janek 1b4d2c741a source_group: Fix TREE with root that is not current source dir
Also raise an error if files are given that are not below the root.

Fixes: #16807
2017-04-21 15:31:02 -04:00
Brad King 4f5bbbeab9 Add deprecation warnings for policies CMP0036 and below
The OLD behaviors of all policies are deprecated, but only by
documentation.  Add an explicit deprecation diagnostic for some policies
to encourage projects to port away from setting policies to OLD.
2017-04-21 15:04:33 -04:00
Brad King 81f9c9e892 Deprecate Visual Studio 8 2005 generator
Update documentation to mark the generator deprecated.  Add a warning at
the end of generation plus an option to turn off the warning.
2017-04-21 13:45:45 -04:00
Brad King eaf53849ec Xcode: Compute version number earlier 2017-04-21 13:10:28 -04:00
Ben Boeckel 3d1bd01114 cmCTestTestHandler: use pointers to static memory
There's no need to reserve 100 bytes for each of these strings.
2017-04-21 13:03:01 -04:00
Ben Boeckel 5969048d1d cmCTestTestCommand: defer getting the global timeout 2017-04-21 13:03:00 -04:00
Brad King 1d8f0f9181 Merge topic 'enable_ptx_compilation'
23691d78 CUDA: Allow sources to be compiled to .ptx files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !725
2017-04-21 08:57:59 -04:00
Ben Boeckel adf60b2838 ninja: break unnecessary target dependencies
Previously, given two libraries, X and Y where X depends on Y, all
object compilations of X would require the Y library to have been linked
before being compiled. This is not necessary and can instead be loosened
such that object compilations of X only depend on the order-only
dependencies of Y to be completed. This is to ensure that generated
sources, headers, custom commands, etc. are completed before X starts to
compile its objects.

This should help build performance in projects with many libraries which
cause a deep library dependency chain. Previously, a library at the
bottom would not start compilation until after all other libraries
completed, but now only its link step needs to wait and its compilation
jobs can be run in parallel with other tasks.

Fixes: #15555
2017-04-21 08:57:40 -04:00
Ben Boeckel 7f947b602f ninja: remove duplicate order-only dependencies 2017-04-21 08:57:02 -04:00
Ben Boeckel e9827eba68 ninja: describe the intermediate order depends target better
This is only used for compiled objects, so indicate it as such.
2017-04-21 08:57:02 -04:00
Brad King b57b7d8e55 Ninja: Order Fortran dyndep file generation explicitly
Each target's dyndep file generation depends on loading information
generated by the same step in its dependencies.  Add an explicit
ordering dependency to ensure the needed information is available.
Without the explicit ordering dependency we were abusing the more
general target ordering rules through the preprocessor rules generating
the `.ddi` files used as input to dyndep file generation.
2017-04-21 08:57:02 -04:00
Brad King ecf94cbc51 Merge topic 'kwsys-import-cleanup'
93219c40 Merge branch 'upstream-KWSys' into kwsys-import-cleanup
22729eae KWSys 2017-04-20 (8785f84f)
d88a511d kwsys: match upstream changes
a139b81a update-kwsys: apply changes made in CMake to the import
e832c32c kwsys: remove extra attribute

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Brad King <brad.king@kitware.com>
Merge-request: !728
2017-04-21 08:56:08 -04:00
Brad King 59f07efd59 Merge topic 'fix-vs2017-guid-braces'
fd7e8f33 VS: Fix project reference inspection in VS IDE

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !727
2017-04-21 08:54:38 -04:00
Brad King 5b241d0ae8 Merge topic '16760-refactor-get-mac-content-directory'
cf320f7c Replace boolean `implib` parameters with enum

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !662
2017-04-21 08:53:16 -04:00
Brad King 718daeb4e6 Merge topic 'unified-commandline-length'
bbb5c3ef Ninja,Makefile: Unify command line limit logic

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !705
2017-04-21 08:51:49 -04:00
Brad King bcf066435c Merge topic '16795-xcode-system-header-search-paths'
ffdde4a9 Xcode: Use SYSTEM_HEADER_SEARCH_PATHS attribute for system includes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !726
2017-04-21 08:50:35 -04:00
Brad King 2b7aecba16 Merge topic 'autogen-fixes'
09035319 Autogen: Pass explicit predefines header to moc if possible

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !671
2017-04-21 08:43:43 -04:00
Daniel Pfeifer 73020305af clang-tidy: avoid copy 2017-04-21 10:50:25 +02:00
Daniel Pfeifer b432e933cb clang-tidy: use .empty() to check emptyness 2017-04-21 10:44:07 +02:00
Daniel Pfeifer 012972a926 clang-tidy: remove reduntant .data() calls 2017-04-21 10:44:07 +02:00
Daniel Pfeifer b26577c92a clang-tidy: remove else after break and continue 2017-04-21 10:44:07 +02:00
Kitware Robot 1b0c7bca5e CMake Nightly Date Stamp 2017-04-21 00:01:12 -04:00
Ben Boeckel d88a511da3 kwsys: match upstream changes
This allows the import to merge cleanly.
2017-04-20 15:35:39 -04:00
Robert Maynard 23691d789e CUDA: Allow sources to be compiled to .ptx files
When the target property `CUDA_PTX_COMPILATION` is enabled CUDA OBJECT
libraries will generate ptx files instead of object files.
2017-04-20 13:25:38 -04:00
Ben Boeckel e832c32ca8 kwsys: remove extra attribute
This is set in `Source/.gitattributes` already and does not need to be
set inside of the import.
2017-04-20 12:53:33 -04:00
Brad King 59224c3989 Merge branch 'fix-vs2017-guid-braces' into release 2017-04-20 10:31:14 -04:00
Richard Walters fd7e8f339a VS: Fix project reference inspection in VS IDE
The braces around project reference GUIDs for vcxproj projects were
apparently optional in the past, but Visual Studio 2017 is more strict,
displaying a warning, and not displaying project reference properties
unless the braces are present.

Fixes: #16820
2017-04-20 10:30:21 -04:00
Gregor Jasny cf320f7cd7 Replace boolean implib parameters with enum
Named enumeration values are much clearer at call sites and add more
type safety.
2017-04-20 10:22:33 -04:00
Aleix Pol 0903531964 Autogen: Pass explicit predefines header to moc if possible
Qt is relying on whoever calls moc to include a file with the predefined
values that will be used by the compiler, otherwise moc takes wrong
paths and weird things happen.
Instead, generate an include file and feed it to all mocs to make sure
it's generating correct code.

Co-Author: Sebastian Holtermann <sebholt@xwmw.org>
Fixes: #16640
2017-04-20 08:59:07 -04:00
Brad King 24b04b5134 Merge topic 'remove-vs7.1-generator'
c94f1bcf Drop Visual Studio 7 .NET 2003 generator
a4452fd8 cmGlobalVisualStudioGenerator: Drop VS7 enumeration value
6e66fe5f cmGlobalVisualStudio8Generator: Drop unused GetDocumentation method

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !723
2017-04-20 08:47:26 -04:00
Brad King 09e3864b4b Merge topic 'update-kwsys'
697a5d64 Merge branch 'upstream-KWSys' into update-kwsys
5785482c KWSys 2017-04-19 (9f6ffaff)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !716
2017-04-20 08:45:42 -04:00
Kitware Robot 3452f8b209 CMake Nightly Date Stamp 2017-04-20 00:01:06 -04:00
Gregor Jasny ffdde4a9ae Xcode: Use SYSTEM_HEADER_SEARCH_PATHS attribute for system includes
Closes #16795
2017-04-19 22:28:50 +02:00
Brad King c94f1bcf92 Drop Visual Studio 7 .NET 2003 generator
This generator has been deprecated since CMake 3.6.  Remove it.
2017-04-19 15:28:05 -04:00
Brad King a4452fd82d cmGlobalVisualStudioGenerator: Drop VS7 enumeration value
We no longer support the VS 7.0 (.NET 2002) IDE, so drop the enumeration
value corresponding to its version.
2017-04-19 14:54:57 -04:00
Brad King 6e66fe5f97 cmGlobalVisualStudio8Generator: Drop unused GetDocumentation method
This has been moved to the factory.
2017-04-19 14:45:00 -04:00
Christian Pfeiffer bbb5c3efe2 Ninja,Makefile: Unify command line limit logic
Move the logic to cmSystemTools to be shared among the generators.
Revise the implementation and add comments justifying each possible
source for a limit.
2017-04-19 11:02:24 -04:00
Brad King 44f0d2d991 Merge topic 'objlib-extend'
eec93bce Allow OBJECT libraries to be installed, exported, and imported
93c89bc7 Genex: Allow TARGET_OBJECTS to be used everywhere
ac0cf7ff Genex: Reject TARGET_OBJECTS on non-object libraries earlier
8577978c Tests: ExportImport C code should use explicit (void) in prototypes
26cfd039 cmInstallTargetGenerator: Re-order GenerateScriptForConfig logic
25f3f22a cmGlobalGenerator: Add method to check if object file location is known
d596c550 cmGeneratorTarget: Add method to get the object file directory
930042f2 cmGeneratorTarget: Factor out a GetTargetObjectNames method
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !712
2017-04-19 10:47:31 -04:00
Brad King 872d08ad34 Merge topic 'cmake-gui-desktop-icon-wayland'
86787633 cmake-gui:  Fix display of icon under Wayland.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !715
2017-04-19 10:42:10 -04:00
Brad King 697a5d64d8 Merge branch 'upstream-KWSys' into update-kwsys
* upstream-KWSys:
  KWSys 2017-04-19 (9f6ffaff)
2017-04-19 08:02:06 -04:00
Kitware Robot 3d3144bb02 CMake Nightly Date Stamp 2017-04-19 00:01:05 -04:00