Commit Graph
22626 Commits
Author SHA1 Message Date
Daniel Pfeifer 44b8debff4 cmGlobalGenerator::DirectoryContent: remove custom copy ctor 2017-04-22 00:48:20 +02:00
Daniel Pfeifer 73bedfea38 cmTargetDepend: pass by value 2017-04-22 00:48:19 +02:00
Daniel Pfeifer e6c606c7ba cmGeneratorTarget::SourceFileFlags: remove custom copy ctor 2017-04-22 00:48:19 +02:00
Daniel Pfeifer 8d090ff253 cmLinkImplItem: remove custom copy ctor 2017-04-22 00:48:19 +02:00
Daniel Pfeifer a8a9577e46 cmLinkItem: remove custom copy ctor 2017-04-22 00:48:19 +02:00
Daniel Pfeifer bf955e58f7 cmComputeLinkInformation::Item: remove custom copy ctor 2017-04-22 00:48:19 +02:00
Daniel Pfeifer b44659f5e8 cmCryptoHash: make noncopyable 2017-04-22 00:48:19 +02:00
Daniel Pfeifer 7284b15f8c cmScriptGenerator: pass Indent by value 2017-04-22 00:48:18 +02:00
Daniel Pfeifer e99dd765b7 cmScriptGenerator: make noncopyable 2017-04-22 00:48:18 +02:00
Daniel Pfeifer d921e8eb6c cmMakefile::ScopePushPop: make noncopyable 2017-04-22 00:48:18 +02:00
Daniel Pfeifer 41a9765386 cmStateDetail::PolicyStackEntry: remove custom copy ctor 2017-04-22 00:48:18 +02:00
Daniel Pfeifer a5d85a31d9 cmDefinitions::Def: remove custom copy ctor 2017-04-22 00:48:18 +02: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
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
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
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
Robert Maynard eec93bceec Allow OBJECT libraries to be installed, exported, and imported
Teach install() and export() to handle the actual object files.
Disallow this on Xcode with multiple architectures because it
still cannot be cleanly supported there.

Co-Author: Brad King <brad.king@kitware.com>
2017-04-18 11:36:10 -04:00
Robert Maynard 93c89bc75c Genex: Allow TARGET_OBJECTS to be used everywhere
Previously the `TARGET_OBJECTS` generator expression was limited
only to use in a buildsystem context so that Xcode's placeholders
in object file paths can be evaluated.  Lift this restriction so
that the expression can at least be used in most settings.

Co-Author: Brad King <brad.king@kitware.com>
2017-04-18 11:36:09 -04:00
Brad King ac0cf7ff4f Genex: Reject TARGET_OBJECTS on non-object libraries earlier
Move the diagnostic that rejects the TARGET_OBJECTS generator expression
in non-buildsystem context until after the check for whether the named
target is an object library.  This order will makes more sense than the
previous order once TARGET_OBJECTS is allowed in non-buildsystem
context.
2017-04-18 10:29:36 -04:00
Brad King 26cfd039a9 cmInstallTargetGenerator: Re-order GenerateScriptForConfig logic
Do not populate some local variables before switching on the target
type.
2017-04-18 09:03:33 -04:00
Brad King 25f3f22a1a cmGlobalGenerator: Add method to check if object file location is known
Add a `HasKnownObjectFileLocation` method returning whether we know the
exact location of object files produced by the native build system.
This is true everywhere except on Xcode when an architecture placeholder
is used.
2017-04-18 09:03:33 -04:00
Brad King d596c5504e cmGeneratorTarget: Add method to get the object file directory
Add a `GetObjectDirectory` method to get the target's object file
directory for a specific configuration.
2017-04-18 09:03:33 -04:00
Brad King 930042f2d9 cmGeneratorTarget: Factor out a GetTargetObjectNames method 2017-04-18 09:03:32 -04:00
Brad King f7e3a34d3c Merge topic 'ipo-var-per-config'
470437f6 Support CMAKE_INTERPROCEDURAL_OPTIMIZATION_<CONFIG>

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !709
2017-04-18 08:54:24 -04:00
Brad King a3636dde57 Merge topic 'fix-CMP0026-old'
5e616fcf CMP0026: Fix OLD behavior with file written during configure step

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !710
2017-04-18 08:51:54 -04:00
Kitware Robot c6a41a13bc CMake Nightly Date Stamp 2017-04-18 00:01:04 -04:00
Clinton Stimpson 86787633f8 cmake-gui: Fix display of icon under Wayland.
Fixes: #16797
2017-04-17 16:48:25 -06:00
Ruslan Baratov 470437f6f9 Support CMAKE_INTERPROCEDURAL_OPTIMIZATION_<CONFIG> 2017-04-18 03:10:34 +08:00