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
Gregor Jasny
ad262917d9
Xcode: Add unit test for iOS project install ( #12506 )
2015-08-26 20:54:52 +02: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
Stephen Kelly
84b847e42f
cmGeneratorTarget: Move ComputeLinkInterface from cmTarget.
2015-08-26 19:38:14 +02:00
Stephen Kelly
6220241fd0
cmGeneratorTarget: Move GetLinkInterface from cmTarget.
2015-08-26 19:37:45 +02:00
Stephen Kelly
6353816786
cmTarget: Add GetHeadToLinkInterfaceMap methods.
2015-08-26 19:37:32 +02:00
Stephen Kelly
20993de464
cmTarget: Move cmHeadToLinkInterfaceMap out.
2015-08-26 19:37:06 +02:00
Stephen Kelly
f8ca51a054
cmGeneratorTarget: Move ComputeLinkInterface from cmTarget.
2015-08-26 19:36:13 +02:00
Stephen Kelly
d67584ccc4
cmTarget: Move link interface libraries struct out.
2015-08-26 19:35:45 +02:00
Kitware Robot
33df7f36d0
CMake Nightly Date Stamp
2015-08-26 00:01:07 -04:00
Stephen Kelly
7f551b4f26
cmGlobalGenerator: Implement VS6 check without virtual method.
...
Don't require existence of a global generator for this check.
2015-08-25 23:06:33 +02:00
Stephen Kelly
cd6293cdf8
cmMakefile: Fix style.
2015-08-25 23:06:33 +02:00
Stephen Kelly
de6b289582
cmTarget: Remove vestigal method declaration.
...
The definition was removed in commit v3.1.0-rc1~688^2~5 (cmTarget:
Allow any generator expression in SOURCES property., 2014-03-18).
2015-08-25 23:06:33 +02:00
Stephen Kelly
e35ee02d6e
cmTarget: Fix indentation.
2015-08-25 23:06:33 +02:00
Stephen Kelly
00f2298f07
Reduce uses of cmMakefile::GetGlobalGenerator.
...
Don't assume the cmMakefile has a global generator.
2015-08-25 23:06:33 +02:00
Stephen Kelly
6254ba9578
cmMakefile: Remove Internal class.
...
Move only remaining state to the direct class.
2015-08-25 22:19:57 +02:00
Stephen Kelly
cf0a78dc4c
cmGeneratorTarget: Issue messages through the local generator.
2015-08-25 22:18:39 +02:00
Gregor Jasny
48fe617e66
Fix installation of iOS targets ( #12506 )
...
Since cmTarget::ComputeOutputDir results can be used in CMake code of script
cmake_install.cmake and in Xcode internals, string ${EFFECTIVE_PLATFORM_NAME}
should be used instead of $(EFFECTIVE_PLATFORM_NAME) because it works for both.
Value of CMAKE_CFG_INTDIR can't be used in BUILD_TYPE argument of install
command since it contains $(EFFECTIVE_PLATFORM_NAME) (e.g. equals to
`Release-iphoneos`, `Debug-iphoneos`, etc.).
2015-08-25 21:53:51 +02:00
Gregor Jasny
d2c2319d64
Replace CMAKE_XCODE_EFFECTIVE_PLATFORMS with call to PlatformIsAppleIos
...
Currently the CMAKE_XCODE_EFFECTIVE_PLATFORMS property acts only as
a kind of toggle switch to enable iOS project layout features.
But instead of relying on this undocumented property, better detect
the presence of an iOS SDK directly.
2015-08-25 21:53:51 +02:00
Brad King
cdb9984bff
Merge topic 'consistent-empty'
...
e876963f
Replace '0 == instances.size()' with instances.empty().
44ffb9cd
Replace foo.size() pattern with !foo.empty().
8f89f8b1
Replace 'foo.size() != 0' pattern with !foo.empty().
524610f9
Replace 'foo.size() == 0' pattern with foo.empty().
0e14c7ee
Replace 'foo.size() > 0' pattern with !foo.empty().
2015-08-25 15:13:33 -04:00
Brad King
96dafff97f
Merge topic 'libarchive-modern-apis'
...
e7f93715
Use modern libarchive APIs
2015-08-25 15:13:31 -04:00
Brad King
90eb6de68f
Merge topic 'fphsa-typo'
...
64e527db
FPHSA: fix typo in documentation
2015-08-25 15:13:29 -04:00
Brad King
84aa2519b0
Merge topic 'fix-load-command-doc-classification'
...
1869eacb
Help: Fix classification of load_command in command TOC.
2015-08-25 15:13:27 -04:00
Brad King
d030a46913
Merge topic 'FindJNI-linux-x32'
...
c4d78b8b
FindJNI: Add support for x32 architecture on Linux (#15710 )
2015-08-25 15:13:25 -04:00
Brad King
9aeee9c608
Merge topic 'cmState-prop_dir'
...
f4150bd8
cmState: Move directory Properties from cmMakefile.
01787547
cmMakefile: Inline GetDefinitions into GetProperty.
2015-08-25 15:13:23 -04:00
Stephen Kelly
637c56b4e0
cmGlobalGenerator: Implement FillProjectMap in terms of cmState.
2015-08-25 19:57:44 +02:00
Stephen Kelly
b3f2299e06
cmState: Move ProjectName from cmMakefile.
2015-08-25 19:57:42 +02:00
Stephen Kelly
6ce940ac97
cmMakefile: Use std::string in ProjectName API.
2015-08-25 19:55:34 +02:00