kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
30,434 Commits 1 Branch 14 Tags
Commit Graph

1205 Commits

Author SHA1 Message Date
Brad King
2fd5fd1f4d Merge topic 'minor-cleanups' 
13a37f5f cmMakefile: Fix typo in comment
958508bb cmMakefile: Fix style
91a829c1 Makefiles: Remove unused variable
e0213882 cmTarget: Remove obsolete member
0554c2c9 cmTarget: Fix style
b22e5d0a Remove some obsolete declarations
ce43ed2c Use LocalGenerator when possible
d90c9738 Makefiles: Remove some unneeded casts
331023ae Export: Remove unused variable
a03f3d0e cmFunctionBlocker: Constify method
d50c4220 Xcode: Fix typo in comment
803f1901 Xcode: Remove trailing semicolon
 2015-10-28 08:48:08 -04:00
Stephen Kelly
13a37f5f76 cmMakefile: Fix typo in comment 2015-10-27 21:54:12 +01:00
Stephen Kelly
958508bb1f cmMakefile: Fix style 2015-10-27 21:54:11 +01:00
Stephen Kelly
7a6caae1a7 cmMakefile: Add imported target accessor 2015-10-27 07:44:25 +01:00
Stephen Kelly
a67231ac11 cmTarget: Implement ALIAS in terms of name mapping 
Remove mapping to cmTarget.
 2015-10-27 07:44:24 +01:00
Stephen Kelly
0c97d32f7a cmGlobalGenerator: Remove direct storage of targets 
Find the target by looping when needed.
 2015-10-27 07:44:23 +01:00
Stephen Kelly
780bff5279 cmake: Store hardcoded lists of sources and headers 
Don't duplicate this in each cmMakefile.
 2015-10-27 07:44:22 +01:00
Stephen Kelly
f210cb131e cmTarget: Make compatbility API explicit. 2015-10-27 07:44:20 +01:00
Brad King
d71920c457 Merge topic 'xcode-watch-and-tvos' 
a91eebeb Xcode: Recognise Watch and TV OS as embedded platforms
 2015-10-26 13:13:02 -04:00
Gregor Jasny
a91eebebdb Xcode: Recognise Watch and TV OS as embedded platforms 2015-10-23 22:19:43 +02:00
Brad King
e2d4bfef3f Merge topic 'fix-CMP0054-elseif-warning' 
d6a03b47 cmIfCommand: Issue CMP0054 warning with appropriate context. (#15802)
 2015-10-21 09:16:49 -04:00
Stephen Kelly
d6a03b475e cmIfCommand: Issue CMP0054 warning with appropriate context. (#15802) 
Commit v3.4.0-rc1~494^2~4 (cmMakefile: Add API for elseif to create
backtrace., 2015-05-29) removed the use of cmMakefileCall to push/pop
execution context in favor of a new way to create backtraces.

However, a call to cmMakefile::GetExecutionContext is still invoked to
issue a contextual CMP0054 warning through cmConditionEvaluator.  As
the elseif is not part of the call stack, this resulted in trying to
access an empty vector.

Avoid the attempt at getting execution context when evaluating elseif by
constructing a context and backtrace on behalf of the cmConditionEvaluator
in all cases.
 2015-10-20 23:40:12 +02:00
Stephen Kelly
55474e6182 cmState: Move GetTargetTypeName from cmTarget. 2015-10-15 00:41:40 +02:00
Stephen Kelly
eac15298a8 cmState: Move TargetType enum from cmTarget. 
Mostly automated:

 values=( "EXECUTABLE" "STATIC_LIBRARY" "SHARED_LIBRARY" "MODULE_LIBRARY" "OBJECT_LIBRARY" "UTILITY" "GLOBAL_TARGET" "INTERFACE_LIBRARY" "UNKNOWN_LIBRARY" "TargetType")
 for i in "${values[@]}"; do     git grep -l cmTarget::$i | xargs sed -i "s|cmTarget::$i|cmState::$i|g"; done
 2015-10-15 00:41:39 +02:00
Stephen Kelly
482b3811e4 cmTarget: Move link type enum out. 
Remove a reason for generate time code to depend on the cmTarget header/type.
 2015-10-15 00:41:22 +02:00
Brad King
ad3ff60f4a Merge topic 'genex-generator-objects' 
2293d43d cmLocalGenerator: Store cmGeneratorTargets.
488723f5 cmMakefile: Store container of cmExportBuildFileGenerators.
15834405 cmGeneratorExpression: Port interface to cmGeneratorTarget.
11165525 cmGeneratorExpression: Port to cmLocalGenerator.
 2015-10-14 13:35:59 -04:00
Stephen Kelly
2293d43d00 cmLocalGenerator: Store cmGeneratorTargets. 
Relieve cmMakefile of this responsibility.
 2015-10-14 13:32:09 -04:00
Stephen Kelly
488723f5cd cmMakefile: Store container of cmExportBuildFileGenerators. 
Set a cmLocalGenerator on each instance at compute time.  That will
soon be needed to access cmGeneratorTarget instances.

If a cmExportBuildFileGenerator is processed early during configure time as a
result of CMP0024 it must be removed from the list to process later at generate
time.
 2015-10-14 13:32:09 -04:00
Stephen Kelly
2bf7de167f Subdirs: Initialize from parent before configuring. 
Add new API for the subdirs command to cmState.

This fixes a regression introduced in commit f716460e (cmMakefile: Move
invokation to initialize snapshot., 2015-10-06).
 2015-10-14 00:34:11 +02:00
Stephen Kelly
0aa34de549 cmState: Initialize properties immediately. 
Don't leave this as cmMakefile responsibility.
 2015-10-14 00:16:21 +02:00
Stephen Kelly
20b95ef8c8 cmState: Initialize default definitions immediately. 
Don't leave this as cmMakefile responsibility.
 2015-10-14 00:16:20 +02:00
Stephen Kelly
841164cb36 cmState: Initialize current directories immediately. 
Don't leave this as cmMakefile responsibility.
 2015-10-14 00:16:07 +02:00
Stephen Kelly
2c219bafc0 cmState: Initialize top level source directories immediately. 
Don't leave this as cmMakefile responsibility.
 2015-10-14 00:16:07 +02:00
Stephen Kelly
84e0776e77 cmMakefile: Set default internal definitions directly. 
The usage tracking of cmMakefile::AddDefinition is not needed.
 2015-10-14 00:16:06 +02:00
Stephen Kelly
871ab98dad cmMakefile: Set internal definitions directly. 
The usage tracking of cmMakefile::AddDefinition is not needed.
 2015-10-14 00:16:06 +02:00
Brad King
83d2b6f378 Merge topic 'refactor-cache-manager' 
79a309d7 cmState: Port away from cmake instance.
e2eecae2 cmState: Move ParseCacheEntry from cmCacheManager.
b5212c68 cmState: Add API for cache version.
95b0d761 cmState: Externalize logic to caller.
6f02034e cmState: Make AddCacheEntry method private.
435a2f3c cmCacheManager: Port away from cmake instance.
062ed22e cmState: Add cache file manipulation wrappers.
a02e53eb Inline unary LoadCache.
bec3487f cmCacheManager: Remove cmMakefile dependency.
e0f740f1 Always cache entries through the cmake instance.
2afadb0d cmake: Port away from trivial cmCacheManager use.
3d8c299f cmake: Use existing cache API wrapper.
 2015-10-12 10:26:18 -04:00
Brad King
762108f3ec Merge topic 'add-cmLocalGenerator-API' 
223d0efe Remove some needless GetMakefile() calls.
a367416c cmLocalGenerator: Add current source directory accessor.
bbef3c2d cmLocalGenerator: Add current binary directory accessor.
12cb3bdc cmLocalGenerator: Add Home directory accessors.
72efa15d Eclipse: Port API to cmLocalGenerator.
f2a641d6 Kate: Remove unused variables.
10cf42f5 Kate: Port API to cmLocalGenerator.
e46ef270 export: Port internal method to cmGeneratorTarget.
53d3a1c9 cmMakefile: Remove unused GetProjectName calls.
4ab2750c cmLocalGenerator: Add GetProjectName method.
c8187f41 cmCPluginAPI: Inline code to get project name.
8c6e6dd3 cmMakefile: Inline initialization of project name.
27916f2c cmLocalGenerator: Add cmake instance accessor.
 2015-10-12 10:26:15 -04:00
Stephen Kelly
e0f740f1b1 Always cache entries through the cmake instance. 2015-10-10 15:36:57 +02:00
Stephen Kelly
4f767afe1d cmMakefile: Remove unneeded container clears. 
No need to do that in a destructor.
 2015-10-09 00:05:14 +02:00
Stephen Kelly
53d3a1c95a cmMakefile: Remove unused GetProjectName calls. 2015-10-09 00:00:18 +02:00
Stephen Kelly
8c6e6dd3ce cmMakefile: Inline initialization of project name. 2015-10-09 00:00:18 +02:00
Stephen Kelly
28749903b6 cmState: Internalize the initialization of a snapshot from its parent. 2015-10-07 20:19:42 +02:00
Stephen Kelly
6c02f62f75 Remove now-unused directory setters. 2015-10-07 20:19:42 +02:00
Stephen Kelly
360e4e1db0 Set the current dirs on the snapshot before creating the cmMakefile. 
The cmMakefile should get a fully prepared snapshot and not clobber its
definitions.  It should eventually be able to process list files from any
starting-point snapshot, though that is some refactoring away still.
 2015-10-07 20:19:41 +02:00
Stephen Kelly
f716460ed8 cmMakefile: Move invokation to initialize snapshot. 2015-10-06 21:46:09 +02:00
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