Brad King
e67e0155d9
cmMakefile: Avoid name conflict with Solaris global typedef
...
On Solaris there is a global typedef called 'single':
/usr/include/floatingpoint.h:77:15: note: shadowed declaration is here
typedef float single;
Avoid shadowing it by using a different name.
2015-09-30 08:47:02 -04:00
Stephen Kelly
203eada65e
cmMakefile: Remove Configured state.
...
It is vestigial.
2015-09-27 12:08:07 +02:00
Stephen Kelly
c5f07e0537
cmGlobalGenerator: Create local generators after all makefiles configured.
2015-09-24 09:39:38 +02:00
Stephen Kelly
8a88089bbe
cmMakefile: Create the local generator after configuring the makefile.
...
The local generator is not used during configure time.
2015-09-24 09:39:38 +02:00
Stephen Kelly
3e08b4df95
cmMakefile: Skip Global targets for CMP0019 evaluation.
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
92041eec49
cmGlobalGenerator: Remove MakeLocalGenerator method.
...
Inline implementation to callers.
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
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
Stephen Kelly
cd6293cdf8
cmMakefile: Fix style.
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
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
Stephen Kelly
e8c0341d86
cmMakefile: Out-of-line GetProjectName.
2015-08-25 19:55:32 +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
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
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
Stephen Kelly
bff27391a9
cmState: Host variable definitions.
2015-08-23 19:05:11 +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
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
Stephen Kelly
73e4df99cb
cmGlobalGenerator: Store a container of cmMakefiles.
...
For use at configure-time.
2015-08-07 04:10:28 +02:00
Brad King
73e3de381d
Merge topic 'cmState-policies'
...
757a1f54
cmState: Move PolicyState from cmMakefile.
52dbe654
cmState: Record the end position of each directory.
65a5e0c6
cmLinkedTree: Add Clear API.
34835433
cmState: Add Type for policy scope.
af0de01c
cmState: Remove call stack parent tracking.
6ae8b30b
cmMakefile: Move policy barriers inside cmState scopes.
a5fc17b5
cmMakefile: Re-order policy entries and barriers.
0a01e6c6
cmState: Add Snapshot Type accessor.
f0005bb4
Tests: Verify generate-time policy scope behavior.
2015-08-06 09:38:24 -04:00
Brad King
370e2c6785
Merge topic 'refactor-evaluation-files'
...
12c3f248
cmGeneratorExpressionEvaluationFile: Require generator context.
6c0e9ee2
cmMakefile: Store EvaluationFiles.
2015-08-06 09:38:22 -04:00
Brad King
d356bced9b
Merge topic 'fix-missing-subdir-error'
...
c4d2f64f
add_subdirectory: Fix error message on missing CMakeLists.txt (#15680 )
2015-08-06 09:38:17 -04:00
Brad King
c4d2f64f3c
add_subdirectory: Fix error message on missing CMakeLists.txt ( #15680 )
...
Refactoring in commit v3.3.0-rc1~76^2 (cmMakefile: Handle CMP0014 before
configuring the generator, 2015-05-14) accidentally left the file name
"/CMakeLists.txt" in the error message. Remove it and add a test case.
2015-08-04 16:40:13 -04:00
Stephen Kelly
757a1f5408
cmState: Move PolicyState from cmMakefile.
...
Implement lexical scope checking in terms of the state stack instead
of barriers.
2015-08-02 08:56:57 +02:00
Stephen Kelly
348354333a
cmState: Add Type for policy scope.
2015-08-02 08:56:57 +02:00
Stephen Kelly
12c3f24827
cmGeneratorExpressionEvaluationFile: Require generator context.
...
Avoid storing a cmMakefile as a member, and evaluate in the context of
a cmLocalGenerator instead.
2015-08-01 13:07:11 +02:00
Stephen Kelly
6c0e9ee276
cmMakefile: Store EvaluationFiles.
...
Relieve the cmGlobalGenerator of this responsibility. Evaluate
the generator expressions in the context of the cmLocalGenerator.
2015-08-01 13:07:11 +02:00
Stephen Kelly
6ae8b30bf4
cmMakefile: Move policy barriers inside cmState scopes.
2015-08-01 07:18:34 +02:00
Stephen Kelly
a5fc17b509
cmMakefile: Re-order policy entries and barriers.
...
Make the barriers surround the entries.
2015-08-01 07:18:34 +02:00
Stephen Kelly
610572b7d2
cmMakefile: Simplify generate-time cmGeneratorTarget creation.
2015-07-29 10:43:33 -04:00
Stephen Kelly
34b902a5a6
cmMakefile: Move method out of line.
2015-07-29 10:43:31 -04:00
Brad King
aaa322a5cb
cmMakefile: Return target from all AddUtilityCommand signatures
2015-07-29 10:43:31 -04:00
Brad King
280dde34dd
Merge topic 'trace-expand'
...
594bafe5
cmake: add --trace-expand option
2015-07-27 09:31:22 -04:00
Brad King
cb21c548db
Merge topic 'policy-refactor'
...
8329fc01
cmPolicies: Replace unused include.
5447ca1a
cmMakefile: Remove CMP0001 handling to callers.
d0dcce15
cmMakefile: Simplify computation of ancient policy status.
658bfc5c
cmMakefile: Remove redundant condition from policy status computation.
f4a25874
cmMakefile: Inline internal policy status method.
3c45471c
cmPolicies: Enable RVO for internal method.
71e69fc9
cmPolicies: Store only state that users can set.
84e18056
cmMakefile: Convert recursion to loop.
2015-07-27 09:31:18 -04:00
Stephen Kelly
bbb507aebc
cmMakefile: Move the InitializeFromParent method
2015-07-25 14:53:06 +02:00
Stephen Kelly
6ed9c7e024
cmState: Host buildsystem properties for directories.
2015-07-25 14:53:05 +02:00
Stephen Kelly
5447ca1a94
cmMakefile: Remove CMP0001 handling to callers.
2015-07-25 14:48:37 +02:00
Stephen Kelly
d0dcce15f4
cmMakefile: Simplify computation of ancient policy status.
2015-07-25 14:48:37 +02:00
Stephen Kelly
658bfc5c52
cmMakefile: Remove redundant condition from policy status computation.
2015-07-25 14:48:36 +02:00
Stephen Kelly
f4a25874a2
cmMakefile: Inline internal policy status method.
2015-07-25 14:48:36 +02:00
Stephen Kelly
3c45471c2d
cmPolicies: Enable RVO for internal method.
2015-07-25 14:48:36 +02:00
Stephen Kelly
84e1805666
cmMakefile: Convert recursion to loop.
2015-07-25 14:48:36 +02:00
Ben Boeckel
594bafe527
cmake: add --trace-expand option
...
The --trace option is helpful, but sometimes, what you're looking for is
deep under many layers of function calls and figuring out what instance
of the function call you're looking at is tedious to determine (usually
involving patching and message()). Instead, add a --trace-expand option
to trace while expanding commands into what CMake actually sees.
2015-07-23 15:33:10 -04:00
Stephen Kelly
1e77de7411
cmMakefile: Don't clear buildsystem properties.
...
Instead put a sentinal empty entry in the container when a property
is overwritten. Use this sentinal when reading from the containers.
Use iterator::operator+(size_type) directly instead of std::advance,
because this only really makes sense if using RandomAccessIterators.
2015-07-22 21:23:49 +02:00