Brad King
9a6d7d2e54
Merge topic 'refactor-compute'
...
616d8f02
cmGeneratorTarget: Rename method to match operation.
ec56d244
cmGlobalGenerator: Process evaluation files after target depends.
1e5349a5
cmGlobalGenerator: Access makefile from makefiles container.
2015-08-31 09:48:30 -04:00
Brad King
352e8e95b6
Merge topic 'generate-time-generators'
...
2b9a25d7
cmGlobalGenerator: Create global targets directly after Configure.
3e08b4df
cmMakefile: Skip Global targets for CMP0019 evaluation.
357bf469
cmGlobalGenerator: Fill the project map at compute time.
ebf8d0a9
cmGlobalGenerator: Rename method.
bd096d30
cmGlobalGenerator: Avoid cmLocalGenerator until after Configure.
ff8ac8ee
cmLocalGenerator: Create from already-constructed cmMakefile.
0bd7279f
Ninja: Remove some incorrect comments adding no value.
2f2d4da9
cmCTestScriptHandler: Simplify deletes.
7fdc9a8b
QtAutogen: Use a smart pointer.
92041eec
cmGlobalGenerator: Remove MakeLocalGenerator method.
acb00622
cmGlobalGenerator: Require a snapshot to create a local generator.
83b8a927
cmMakefile: Remove cmLocalGenerator member.
9b6a743b
cmLocalGenerator: Remove Parent pointer.
2015-08-31 09:48:28 -04:00
Brad King
97db5c5678
Merge topic 'GenerateExportHeader-cygwin-dllexport'
...
3e2865b4
GenerateExportHeader: Use dllexport/dllimport on Cygwin
2015-08-31 09:48:26 -04:00
Kitware Robot
a036a41605
CMake Nightly Date Stamp
2015-08-31 00:01:03 -04:00
Stephen Kelly
616d8f02d5
cmGeneratorTarget: Rename method to match operation.
...
The manifest is computed, not generated, according to current language
used in cmake method naming.
2015-08-30 11:39:52 +02:00
Kitware Robot
2e4eb137b9
CMake Nightly Date Stamp
2015-08-30 00:01:03 -04:00
Stephen Kelly
ec56d24451
cmGlobalGenerator: Process evaluation files after target depends.
...
No need to generate the files if computation aborts generation.
2015-08-29 09:18:01 +02:00
Stephen Kelly
1e5349a5a0
cmGlobalGenerator: Access makefile from makefiles container.
2015-08-29 09:15:37 +02:00
Kitware Robot
746c9f8882
CMake Nightly Date Stamp
2015-08-29 00:01:03 -04:00
Stephen Kelly
2b9a25d7f7
cmGlobalGenerator: Create global targets directly after Configure.
2015-08-28 18:44:39 +02:00
Stephen Kelly
3e08b4df95
cmMakefile: Skip Global targets for CMP0019 evaluation.
2015-08-28 18:44:39 +02:00
Stephen Kelly
357bf469c7
cmGlobalGenerator: Fill the project map at compute time.
2015-08-28 18:44:39 +02:00
Stephen Kelly
ebf8d0a99a
cmGlobalGenerator: Rename method.
2015-08-28 18:44:39 +02:00
Stephen Kelly
bd096d30e0
cmGlobalGenerator: Avoid cmLocalGenerator until after Configure.
2015-08-28 18:44:39 +02:00
Stephen Kelly
ff8ac8ee6a
cmLocalGenerator: Create from already-constructed cmMakefile.
...
Don't manage the lifetime of the cmMakefile with cmLocalGenerator.
2015-08-28 18:44:39 +02:00
Stephen Kelly
0bd7279fd9
Ninja: Remove some incorrect comments adding no value.
2015-08-28 18:44:39 +02:00
Stephen Kelly
2f2d4da9dd
cmCTestScriptHandler: Simplify deletes.
...
Deleting a nullptr is fine.
2015-08-28 18:44:38 +02:00
Stephen Kelly
7fdc9a8b5f
QtAutogen: Use a smart pointer.
2015-08-28 18:44:38 +02:00
Stephen Kelly
92041eec49
cmGlobalGenerator: Remove MakeLocalGenerator method.
...
Inline implementation to callers.
2015-08-28 18:44:38 +02:00
Stephen Kelly
acb006229d
cmGlobalGenerator: Require a snapshot to create a local generator.
2015-08-28 18:44:38 +02:00
Stephen Kelly
83b8a927e5
cmMakefile: Remove cmLocalGenerator member.
2015-08-28 18:44:38 +02:00
Stephen Kelly
9b6a743b80
cmLocalGenerator: Remove Parent pointer.
2015-08-28 18:44:38 +02:00
Kitware Robot
11d5088a2f
CMake Nightly Date Stamp
2015-08-28 00:01:10 -04:00
Tony Kelman
3e2865b467
GenerateExportHeader: Use dllexport/dllimport on Cygwin
...
Cygwin sits on top of Windows and so can use explicit symbol
export and import markup too.
Co-Author: Yaakov Selkowitz <yselkowitz@cygwin.com>
2015-08-27 10:08:34 -04:00
Brad King
27e4b21dfa
Merge topic 'use-generator-target'
...
c2b7336f
cmGeneratorTarget: Move GetConfigCommonSourceFiles from cmTarget.
69329fff
cmGeneratorTarget: Move GetLanguages from cmTarget.
0431f2c4
cmGeneratorTarget: Move ComputeLinkImplementationLanguages from cmTarget.
abe9505d
cmGeneratorTarget: Move HaveBuildTreeRPath from cmTarget.
d4a24c0e
cmGeneratorTarget: Move GetLinkImplementation from cmTarget.
83981cf5
cmTarget: Add GetLinkImplMap method.
771e79a2
cmLinkItem: Add cmOptionalLinkImplementation type.
3846ebcf
cmLinkItem: Add cmLinkImplementation type.
a7f5d70d
cmGeneratorTarget: Move compile defintions processing from cmTarget.
d051086c
cmGeneratorTarget: Move compile features processing from cmTarget.
db4cb92b
cmGeneratorTarget: Move compile options processing from cmTarget.
e6ccbf6f
cmGeneratorTarget: Move include directory processing from cmTarget.
8bfb0c53
cmGeneratorTarget: Move link iface helpers from cmTarget.
2cb3e574
cmGeneratorTarget: Move GetImportLinkInterface from cmTarget.
6d3d099b
cmGeneratorTarget: Move ComputeLinkInterfaceLibraries from cmTarget.
0db9d927
cmGeneratorTarget: Move GetLinkInterfaceLibraries from cmTarget.
...
2015-08-27 10:07:32 -04:00
Brad King
445077cbd2
Merge topic 'minor-cleanups'
...
7f551b4f
cmGlobalGenerator: Implement VS6 check without virtual method.
cd6293cd
cmMakefile: Fix style.
de6b2895
cmTarget: Remove vestigal method declaration.
e35ee02d
cmTarget: Fix indentation.
00f2298f
Reduce uses of cmMakefile::GetGlobalGenerator.
6254ba95
cmMakefile: Remove Internal class.
cf0a78dc
cmGeneratorTarget: Issue messages through the local generator.
2015-08-27 10:04:12 -04:00
Brad King
0d0b9b52f8
Merge topic 'cmState-ProjectName'
...
637c56b4
cmGlobalGenerator: Implement FillProjectMap in terms of cmState.
b3f2299e
cmState: Move ProjectName from cmMakefile.
6ce940ac
cmMakefile: Use std::string in ProjectName API.
e8c0341d
cmMakefile: Out-of-line GetProjectName.
2015-08-27 10:04:09 -04:00
Brad King
6904b6efdc
Merge topic 'rm-cmLocalGenerator-Children'
...
867b5be8
cmLocalGenerator: Remove unused Children member.
6c832219
cmLocalGenerator: Implement child traversal in terms of cmState.
3fcf3837
Makefiles: Remove valueless cast.
223f4a66
cmLocalGenerator: Simplify condition.
ae026f54
cmState: Store Children states in parent state.
2015-08-27 10:04:07 -04:00
Brad King
a97bb6ae3f
Merge topic 'refactor-features'
...
e3078aa1
cmLocalGenerator: Implement GetFeature in terms of cmState.
7441fde3
cmLocalGenerator: Convert GetFeature recursion to loop.
ad0b0089
cmLocalGenerator: Simplify GetFeature implementation.
314c9ae3
cmLocalGenerator: Make GetFeature tail-recursive.
2015-08-27 10:04:05 -04:00
Brad King
2985b9c003
Merge topic 'refactor-progress'
...
7fbc56ac
cmGlobalUnixMakefileGenerator3: Implement progress in terms of cmState.
65c434e1
cmGlobalUnixMakefileGenerator3: Inline an IsExcluded call.
be56feb6
cmGlobalGenerator: Extract new IsExcluded overload.
45f52003
cmGlobalGenerator: Implement IsExcluded in terms of cmState::Snapshot.
af9fc277
cmState: Make Snapshot EqualityComparable.
9b44018d
cmGlobalGenerator: Convert IsExcluded to loop.
5f05b562
cmGlobalGenerator: Refactor IsExcluded.
95925a60
cmGlobalGenerator: Don't use else after return.
2015-08-27 10:04:03 -04:00
Brad King
f96b6af18a
Merge topic 'FindJNI-suse-and-ibm'
...
290b0f94
FindJNI: Add support for SuSE platform and IBM Java SDK
2015-08-27 10:04:01 -04:00
Brad King
ba6533e658
Merge topic 'apple-tbd-stubs'
...
67f60958
Darwin: Add support for tbd library stub files
2015-08-27 10:03:58 -04:00
Brad King
ef0bf87939
Merge topic 'java-updates'
...
4476feac
UseJava: Add support for javah tool
2015-08-27 10:03:56 -04:00
Kitware Robot
81ad5622b4
CMake Nightly Date Stamp
2015-08-27 00:01:06 -04:00
Stephen Kelly
c2b7336ff3
cmGeneratorTarget: Move GetConfigCommonSourceFiles from cmTarget.
2015-08-26 19:46:33 +02:00
Stephen Kelly
69329fff70
cmGeneratorTarget: Move GetLanguages from cmTarget.
2015-08-26 19:46:32 +02:00
Stephen Kelly
0431f2c4d7
cmGeneratorTarget: Move ComputeLinkImplementationLanguages from cmTarget.
2015-08-26 19:46:32 +02:00
Stephen Kelly
abe9505df9
cmGeneratorTarget: Move HaveBuildTreeRPath from cmTarget.
2015-08-26 19:46:32 +02:00
Stephen Kelly
d4a24c0e95
cmGeneratorTarget: Move GetLinkImplementation from cmTarget.
2015-08-26 19:46:32 +02:00
Stephen Kelly
83981cf593
cmTarget: Add GetLinkImplMap method.
...
This is a temporary refactoring artifact.
2015-08-26 19:46:31 +02:00
Stephen Kelly
771e79a2bf
cmLinkItem: Add cmOptionalLinkImplementation type.
...
Move the associated Compute* methods to the cmTarget class.
2015-08-26 19:46:31 +02:00
Stephen Kelly
3846ebcf2b
cmLinkItem: Add cmLinkImplementation type.
2015-08-26 19:46:31 +02:00
Stephen Kelly
a7f5d70dde
cmGeneratorTarget: Move compile defintions processing from cmTarget.
2015-08-26 19:46:30 +02:00
Stephen Kelly
d051086cce
cmGeneratorTarget: Move compile features processing from cmTarget.
2015-08-26 19:46:10 +02:00
Stephen Kelly
db4cb92bda
cmGeneratorTarget: Move compile options processing from cmTarget.
2015-08-26 19:45:51 +02:00
Stephen Kelly
e6ccbf6f30
cmGeneratorTarget: Move include directory processing from cmTarget.
2015-08-26 19:45:21 +02:00
Stephen Kelly
8bfb0c53da
cmGeneratorTarget: Move link iface helpers from cmTarget.
2015-08-26 19:39:29 +02:00
Stephen Kelly
2cb3e57402
cmGeneratorTarget: Move GetImportLinkInterface from cmTarget.
2015-08-26 19:39:17 +02:00
Stephen Kelly
6d3d099b4a
cmGeneratorTarget: Move ComputeLinkInterfaceLibraries from cmTarget.
2015-08-26 19:38:57 +02:00
Stephen Kelly
0db9d92787
cmGeneratorTarget: Move GetLinkInterfaceLibraries from cmTarget.
2015-08-26 19:38:37 +02:00