Brad King
f4bdda87d6
Merge branch 'fix-ctest-xml-double-encoding' into release
2015-08-28 10:15:14 -04:00
Daniel Pfeifer
ab2524d63f
CTest: Fix XML double-encoding cases
...
Remove use of cmXMLSafe from CTest when generating content that is later
handled by cmXMLWriter. This was broken by refactoring in the topic
merged by commit v3.3.0-rc1~22 (Merge topic 'ctest-xml-refactor',
2015-05-28).
2015-08-28 10:11:09 -04:00
Daniel Pfeifer
dee84dc73d
cmCTest{BZR,GIT,P4}: Remove unused cmXMLSafe includes
2015-08-28 10:11:08 -04:00
Daniel Pfeifer
b3372db588
cmExtra{Kate,SublimeText}Generator: Remove unused cmXMLSafe includes
2015-08-28 10:11:08 -04:00
Yunqiang Su
90a22c3ac5
FindJNI: Add mips64(el) mipsn32(el) support ( #15714 )
...
Submitted-by: Felix Geyer <fgeyer@debian.org>
2015-08-28 09:37:22 -04:00
Roman Donchenko
674dc0b335
CPack generator independent tests
...
CPackConfig.cmake file generation from CMake test suite.
Currently it contains only a simple test without special
characters in variable value.
Test is not part of RunCMake/CPack as those tests are
expected to be run for a specified generator.
2015-08-28 08:07:52 +02:00
Kitware Robot
11d5088a2f
CMake Nightly Date Stamp
2015-08-28 00:01:10 -04:00
Gilles Khouzam
ac0bb4333d
VS: Windows Store/Phone package cert thumbprint
...
Add the PackageCertificateThumbprint property when there is a
certificate on a WindowsStore or Phone app.
2015-08-27 13:35:18 -04:00
Brad King
92b835ec9d
Simplify condition for using rpcrt4 library on Windows
...
Drop the CMAKE_BUILD_ON_VISUAL_STUDIO variable and hard-code the
condition at its only use.
2015-08-27 13:35:13 -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
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