Stephen Kelly
8f89f8b1e9
Replace 'foo.size() != 0' pattern with !foo.empty().
2015-08-24 20:47:17 +02:00
Stephen Kelly
524610f967
Replace 'foo.size() == 0' pattern with foo.empty().
2015-08-24 20:47:17 +02:00
Stephen Kelly
0e14c7ee63
Replace 'foo.size() > 0' pattern with !foo.empty().
2015-08-24 20:47:17 +02:00
Brad King
ddb7f280ce
Merge topic 'drop-cmsys-std-layer'
...
04e708d8
Remove use of include <cmsys/IOStream.hxx> from KWSys
e8585f45
Remove use of include <cmsys/stl/*> and cmsys_stl::*
6db713c0
Remove use of include <cmsys/ios/*> and cmsys_ios::*
2015-08-24 14:28:43 -04:00
Stephen Kelly
867b5be8b8
cmLocalGenerator: Remove unused Children member.
2015-08-24 20:05:38 +02:00
Stephen Kelly
6c832219ea
cmLocalGenerator: Implement child traversal in terms of cmState.
2015-08-24 20:05:37 +02:00
Stephen Kelly
3fcf383763
Makefiles: Remove valueless cast.
2015-08-24 20:05:37 +02:00
Stephen Kelly
223f4a662f
cmLocalGenerator: Simplify condition.
2015-08-24 20:05:37 +02:00
Stephen Kelly
ae026f5458
cmState: Store Children states in parent state.
2015-08-24 20:05:37 +02:00
Stephen Kelly
e3078aa153
cmLocalGenerator: Implement GetFeature in terms of cmState.
2015-08-24 20:04:37 +02:00
Stephen Kelly
7441fde34a
cmLocalGenerator: Convert GetFeature recursion to loop.
2015-08-24 20:04:37 +02:00
Stephen Kelly
ad0b0089ab
cmLocalGenerator: Simplify GetFeature implementation.
2015-08-24 20:04:37 +02:00
Stephen Kelly
314c9ae33b
cmLocalGenerator: Make GetFeature tail-recursive.
2015-08-24 20:04:37 +02:00
Stephen Kelly
7fbc56ac40
cmGlobalUnixMakefileGenerator3: Implement progress in terms of cmState.
2015-08-24 20:03:30 +02:00
Stephen Kelly
65c434e1b0
cmGlobalUnixMakefileGenerator3: Inline an IsExcluded call.
2015-08-24 20:03:29 +02:00
Stephen Kelly
be56feb618
cmGlobalGenerator: Extract new IsExcluded overload.
2015-08-24 20:03:29 +02:00
Stephen Kelly
45f5200396
cmGlobalGenerator: Implement IsExcluded in terms of cmState::Snapshot.
2015-08-24 20:03:29 +02:00
Stephen Kelly
af9fc27753
cmState: Make Snapshot EqualityComparable.
2015-08-24 20:03:29 +02:00
Stephen Kelly
9b44018d52
cmGlobalGenerator: Convert IsExcluded to loop.
2015-08-24 20:03:29 +02:00
Stephen Kelly
5f05b56284
cmGlobalGenerator: Refactor IsExcluded.
...
Make it easier to convert it to a loop.
2015-08-24 20:03:29 +02:00
Stephen Kelly
95925a60fc
cmGlobalGenerator: Don't use else after return.
2015-08-24 20:03:29 +02:00
Stephen Kelly
f4150bd88d
cmState: Move directory Properties from cmMakefile.
2015-08-24 20:02:21 +02:00
Stephen Kelly
0178754725
cmMakefile: Inline GetDefinitions into GetProperty.
...
It will soon move to cmState.
2015-08-24 19:48:45 +02:00
Rolf Eike Beer
64e527dbe3
FPHSA: fix typo in documentation
2015-08-24 18:22:13 +02:00
Thorsten Glaser
c4d78b8bc0
FindJNI: Add support for x32 architecture on Linux ( #15710 )
...
This architecture uses an amd64 kernel but x32 userland.
Use CMAKE_LIBRARY_ARCHITECTURE to distinguish it for now.
2015-08-24 10:54:13 -04:00
Páder Rezső
e7f937155f
Use modern libarchive APIs
...
Replace use of deprecated libarchive3 functions with their modern
equivalents.
2015-08-24 10:40:04 -04:00
Brad King
2370a99400
Merge topic 'cmState-definitions'
...
bff27391
cmState: Host variable definitions.
6954c893
cmState: Add a VariableScope snapshot type.
1fc645bd
cmState: Add a Base snapshot type.
0f070dd3
cmMakefile: Decouple the container of cmDefinitions from scoping logic.
25e04ddf
cmDefinitions: Implement in terms of cmLinkedTree.
4bbe261c
cmMakefile: Extract InitializeVarScope method.
2015-08-24 10:07:04 -04:00
Brad King
58043880b9
Merge topic 'ios-app-bundle-layout'
...
744e6c49
Fix iOS Bundle layouts (#15669 )
2015-08-24 10:07:02 -04:00
Brad King
eeeb0eb751
Merge topic 'remove-unused-cmPolicies'
...
d8a57148
cmake: Remove unused cmPolicies member.
2015-08-24 10:07:00 -04:00
Brad King
d5d86ecf50
Merge topic 'refactor-progress'
...
3fa1b964
cmGlobalUnixMakefileGenerator3: Change the progress container key.
55e39276
cmState: Make it possible to order cmState::Snapshot.
04168cbb
cmGlobalUnixMakefileGenerator3: Rename member.
2394584c
cmGlobalGenerator: Rename progress initializer method.
b9eb3cd1
cmGlobalGenerator: Move LG to target map to subclass.
f5d2b7a6
cmGlobalGenerator: Remove clearance of map.
2015-08-24 10:06:58 -04:00
Brad King
9135e3707d
Merge topic 'generators-use-cmLocalGenerator'
...
1f39ee5b
cmInstallExportGenerator: Require cmLocalGenerator, not cmMakefile.
c259b830
cmTestGenerator: Require cmLocalGenerator, not cmMakefile.
75e511ee
cmInstallFilesGenerator: Require cmLocalGenerator, not cmMakefile.
2015-08-24 10:06:56 -04:00
Brad King
aaf9532bbc
Merge topic 'fix-include_directories-BEFORE'
...
a4bd3010
include_directories: Fix regression in BEFORE option (#15693 )
2015-08-24 10:06:54 -04:00
Gregor Jasny
744e6c497c
Fix iOS Bundle layouts ( #15669 )
...
In contrast to Mac OS X App bundle layout the iOS one lacks the
Contents/MacOSX structure. See also the Bundle Structures documentation
in Mac Developer Library:
https://developer.apple.com/library/mac/documentation/CoreFoundation/Conceptual/CFBundles/BundleTypes/BundleTypes.html
For now detect iOS targets by checking the SDK name/path.
2015-08-24 09:50:20 -04:00
Kitware Robot
884c63176f
CMake Nightly Date Stamp
2015-08-24 00:01:06 -04:00
Stephen Kelly
bff27391a9
cmState: Host variable definitions.
2015-08-23 19:05:11 +02:00
Stephen Kelly
d8a5714839
cmake: Remove unused cmPolicies member.
...
heaptrack showed a 1 byte allocation with the backtrace pointing
here, as is the case since commit v3.3.0-rc1~112^2~5 (cmPolicies:
Remove unused cmPolicy class., 2015-05-03)
2015-08-23 18:28:01 +02:00
Stephen Kelly
3fa1b9641d
cmGlobalUnixMakefileGenerator3: Change the progress container key.
2015-08-23 18:05:13 +02:00
Stephen Kelly
55e3927634
cmState: Make it possible to order cmState::Snapshot.
2015-08-23 18:05:13 +02:00
Stephen Kelly
04168cbb59
cmGlobalUnixMakefileGenerator3: Rename member.
2015-08-23 18:05:13 +02:00
Stephen Kelly
2394584ce2
cmGlobalGenerator: Rename progress initializer method.
2015-08-23 18:05:13 +02:00
Stephen Kelly
b9eb3cd140
cmGlobalGenerator: Move LG to target map to subclass.
...
This is the only user.
2015-08-23 18:05:01 +02:00
Stephen Kelly
f5d2b7a694
cmGlobalGenerator: Remove clearance of map.
...
It is always cleared before being re-populated.
2015-08-23 17:49:11 +02:00
Stephen Kelly
1f39ee5beb
cmInstallExportGenerator: Require cmLocalGenerator, not cmMakefile.
2015-08-23 17:46:23 +02:00
Stephen Kelly
c259b83026
cmTestGenerator: Require cmLocalGenerator, not cmMakefile.
2015-08-23 17:46:07 +02:00
Stephen Kelly
75e511eeaf
cmInstallFilesGenerator: Require cmLocalGenerator, not cmMakefile.
2015-08-23 17:21:27 +02:00
Stephen Kelly
6954c8936f
cmState: Add a VariableScope snapshot type.
...
Match the scopes currently used in cmMakefile for definitions.
2015-08-23 17:08:54 +02:00
Stephen Kelly
1fc645bd9c
cmState: Add a Base snapshot type.
...
For completeness mostly.
2015-08-23 17:08:54 +02:00
Stephen Kelly
0f070dd3e1
cmMakefile: Decouple the container of cmDefinitions from scoping logic.
...
Maintain a Parent tree node for writing to in RaiseScope.
2015-08-23 17:08:53 +02:00
Stephen Kelly
25e04ddffe
cmDefinitions: Implement in terms of cmLinkedTree.
...
Store the definitions in a cmLinkedTree in the cmMakefile. This can
be moved to cmState and then the tree will provide snapshotting
possibilities. It will also make the Closure copy created at
the start of each cmMakefile unnecesarry.
2015-08-23 17:08:53 +02:00
Stephen Kelly
4bbe261cd3
cmMakefile: Extract InitializeVarScope method.
2015-08-23 17:08:53 +02:00