kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
28,547 Commits 1 Branch 14 Tags 53 MiB
Commit Graph

18550 Commits

Author SHA1 Message Date
Brad King 82986700d1 Merge topic 'ctest-script-mode-no-legacy-cygwin' 
12436efc ctest: Disable CMake Cygwin legacy warning in dashboard client script
 2015-06-09 09:18:46 -04:00
Brad King d6011a61e9 Merge topic 'cmake-gui-osx-install-command-line' 
d9b974b1 cmake-gui: Make command-line install help text selectable
 2015-06-09 09:18:42 -04:00
Kitware Robot 2848f93d1a CMake Nightly Date Stamp 2015-06-09 00:01:04 -04:00
Stephen Kelly 52b9d828ab cmMakefile: Move CMP0059 handling to command code. 
Don't pay a penalty for it in all GetProperty calls.

Additionally, the storage of properties will eventually move to
cmState, which should only contain state and not logic for policies
like this.
 2015-06-08 22:23:44 +02:00
Stephen Kelly fe603c7dfb cmGetDirectoryPropertyCommand: Move variable to the point of use. 2015-06-08 22:18:42 +02:00
Stephen Kelly 8fc53c3ce8 cmGetDirectoryPropertyCommand: Extract StoreResult method. 2015-06-08 22:18:40 +02:00
Brad King 12436efc14 ctest: Disable CMake Cygwin legacy warning in dashboard client script 
In ctest -S mode we load the CTestScriptMode module to give the
configuration scripts access to the host system information.
CYGWIN.cmake warns unless we explicitly tell it not to warn
since there is no chance for a cmake_minimum_required(VERSION)
to be called.
 2015-06-08 14:16:28 -04:00
Brad King d17aa60659 Merge topic 'data-layout' 
8174e5cd cmCustomCommand: Remove special member functions.
34e1d6db cmCustomCommand: Re-arrange data layout.
54cb76f2 cmComputeLinkDepends: Re-arrange data layout.
b661d6c6 cmQtAutoGenerators: Re-arrange data layout.
40844a14 cmProcessTools: Re-arrange data layout.
b1ff32af cmOrderDirectories: Re-arrange data layout.
dd0417c7 cmInstallTargetGenerator: Re-arrange data layout.
125c4866 cmInstallFilesGenerator: Re-arrange data layout.
92b8b1fc cmGraphVizWriter: Re-arrange data layout.
7f3e1623 cmGlobalGenerator: Re-arrange data layout.
d9df7fa7 cmComputeComponentGraph: Re-arrange data layout.
db24e41b cmCommandArgumentParserHelper: Re-arrange data.
4cd13e80 cmComputeLinkInformation: Re-arrange data layout.
3e087a40 cmLocalUnixMakefileGenerator: Re-arrange data layout.
e0421701 cmMakefile: Re-arrange data layout.
c26696eb cmSourceFile: Re-arrange data.
...
 2015-06-08 13:54:11 -04:00
Brad King ccc6fe9445 Merge topic 'clean-up-cmMakefile' 
4c192fb5 cmMakefile: Remove cacheOnly option from GetDefinitions.
046aafff cmGetCMakePropertyCommand: Don't explicitly specify default param.
021c4b6f cmMakefile: Simplify handling of CACHE_VARIABLES property.
1981c971 cmMakefile: Simplify InitializeFromParent method.
353e422b cmMakefile: Remove unused GetPolicies method.
00bfa047 cmMakefile: Out-of-line the cmMakefileCall.
db74ce58 cmMakefile: Inline PushScope into PushFunctionScope.
ca140c2e cmMakefile: Create a unified raii for macro scopes.
d5dc4169 cmMakefile: Create a unified raii for function scopes.
 2015-06-08 13:54:09 -04:00
Brad King 21c92a00bf Merge topic 'minor-cleanups' 
4ab7d407 cmExportTryCompileFileGenerator: Add newline between methods.
e133e409 cmExportTryCompileFileGenerator: Remove unused variable.
c197c692 cmDocumentation: Remove unused include.
 2015-06-08 13:54:07 -04:00
Brad King f5690cc57c Merge topic 'move-Feature-API' 
f573bd22 cmLocalGenerator: Add Feature API from cmMakefile.
ccbc2259 cmGeneratorTarget: Move Feature API from cmTarget.
 2015-06-08 13:54:05 -04:00
Brad King d18852d596 Merge topic 'extract-cmOutputConverter' 
59e21ffa Port static calls from cmLocalGenerator to cmOutputConverter.
242dcc2c cmListFileBacktrace: Replace local generator with cmState::Snapshot.
1cff330b cmTarget: Port to cmOutputConverter.
2f1bd62b cmCustomCommandGenerator: Port to cmOutputConverter.
0f2a1324 cmCommandArgumentParserHelper: Port to cmOutputConverter.
4d8b79ad cmComputeLinkInformation: Port to cmOutputConverter.
8680520f cmMakefile: Make the cmState::Snapshot accessible.
6d7abb63 cmOutputConverter: Extract from cmLocalGenerator.
a8244157 cmState::Snapshot: Provide accessor for the cmState.
1f4ef396 cmLocalGenerator: Remove some commented lines of code.
 2015-06-08 13:54:02 -04:00
Brad King c8997d1b32 Merge topic 'extract-cmLinkedTree' 
4e5c70ab cmState: Extract a cmLinkedTree container adaptor.
7b9c7586 cmState: Group BuildsystemDirectory state together in a struct.
1b323949 cmState: Extend Snapshot concept with a SnapshotType.
 2015-06-08 10:34:55 -04:00
Brad King 25136d7394 Merge topic 'vs-deterministic-guid' 
cdf2cba3 VS: Use cmUuid RFC 4122 compliant hash based UUID generation
 2015-06-08 10:34:53 -04:00
Clinton Stimpson d9b974b18e cmake-gui: Make command-line install help text selectable 
This will allow users to cut-n-paste the instructions over to a command
prompt.
 2015-06-08 09:59:11 -04:00
Kitware Robot 9d68bd6a24 CMake Nightly Date Stamp 2015-06-08 00:01:03 -04:00
Stephen Kelly 4c192fb531 cmMakefile: Remove cacheOnly option from GetDefinitions. 
It is now unused.
 2015-06-07 15:21:56 +02:00
Stephen Kelly 046aafff12 cmGetCMakePropertyCommand: Don't explicitly specify default param. 2015-06-07 15:21:55 +02:00
Stephen Kelly 021c4b6f2b cmMakefile: Simplify handling of CACHE_VARIABLES property. 2015-06-07 15:21:55 +02:00
Stephen Kelly 8174e5cd94 cmCustomCommand: Remove special member functions. 
The compiler generated ones are fine.  The existing implementations
here are incorrect as they omit some members.
 2015-06-07 11:09:32 +02:00
Stephen Kelly 34e1d6db72 cmCustomCommand: Re-arrange data layout. 
Size goes from 240 to 224 bytes.
 2015-06-07 10:48:15 +02:00
Stephen Kelly 54cb76f299 cmComputeLinkDepends: Re-arrange data layout. 
Size goes from 648 to 632 bytes.
 2015-06-07 10:41:47 +02:00
Stephen Kelly 4ab7d407a5 cmExportTryCompileFileGenerator: Add newline between methods. 2015-06-07 10:32:53 +02:00
Stephen Kelly e133e40937 cmExportTryCompileFileGenerator: Remove unused variable. 2015-06-07 10:32:27 +02:00
Stephen Kelly c197c69281 cmDocumentation: Remove unused include. 2015-06-07 10:32:02 +02:00
Stephen Kelly b661d6c631 cmQtAutoGenerators: Re-arrange data layout. 
Size goes from 920 to 912 bytes.
 2015-06-07 10:24:28 +02:00
Stephen Kelly 40844a1487 cmProcessTools: Re-arrange data layout. 
Size goes from 72 to 64 bytes.
 2015-06-07 10:24:28 +02:00
Stephen Kelly b1ff32afc6 cmOrderDirectories: Re-arrange data layout. 
Size goes from 680 to 672 bytes.
 2015-06-07 10:24:27 +02:00
Stephen Kelly dd0417c7be cmInstallTargetGenerator: Re-arrange data layout. 
Remove unused cmGeneratorTarget member.

Size goes from 238 to 232 bytes.
 2015-06-07 10:24:27 +02:00
Stephen Kelly 125c48660c cmInstallFilesGenerator: Re-arrange data layout. 
Size goes from 296 to 288 bytes.
 2015-06-07 10:24:27 +02:00
Stephen Kelly 92b8b1fc3d cmGraphVizWriter: Re-arrange data layout. 
Size goes from 272 to 264 bytes.
 2015-06-07 10:24:26 +02:00
Stephen Kelly 7f3e16239f cmGlobalGenerator: Re-arrange data layout. 
Size goes from 1488 to 1480 bytes.
 2015-06-07 10:24:26 +02:00
Stephen Kelly d9df7fa70c cmComputeComponentGraph: Re-arrange data layout. 
Size goes from 224 to 216 bytes.
 2015-06-07 09:43:39 +02:00
Stephen Kelly db24e41b9d cmCommandArgumentParserHelper: Re-arrange data. 
Size goes from 232 to 216 bytes.
 2015-06-07 09:41:19 +02:00
Stephen Kelly 4cd13e80f0 cmComputeLinkInformation: Re-arrange data layout. 
Size goes from 1944 to 1920 bytes.
 2015-06-07 09:32:39 +02:00
Stephen Kelly 3e087a408b cmLocalUnixMakefileGenerator: Re-arrange data layout. 
Size goes from 536 to 528 bytes.
 2015-06-07 09:32:38 +02:00
Stephen Kelly e042170103 cmMakefile: Re-arrange data layout. 
2168 to 2152 bytes with GNU libstdc++-5.1.
 2015-06-07 09:32:38 +02:00
Stephen Kelly c26696eb40 cmSourceFile: Re-arrange data. 
Size goes from 304 to 296 bytes.
 2015-06-07 09:32:24 +02:00
Stephen Kelly 41fef23b9b cmTarget: Re-arrange data layout. 
Size with GNU libstdc++-5.1 goes from 840 bytes to 808 bytes.
 2015-06-07 09:29:31 +02:00
Stephen Kelly 647488570b cmTarget: Replace PolicyStatus members with PolicyMap. 
sizeof(cmTarget) goes from 856 to 840 with GNU libstdc++ 5.1.
 2015-06-07 09:29:31 +02:00
Stephen Kelly 6f148e4a48 cmTarget: Use method abstraction for policy status. 2015-06-07 09:29:31 +02:00
Stephen Kelly 5181fae264 cmPropertyMap: Remove chaining logic. 
The chaining logic doesn't belong to the container, and the
CMakeInstance pointer doesn't need to be in cmPropertyMap.

Size goes from 56 to 48 bytes with GNU libstdc++-5.1.
 2015-06-07 09:29:31 +02:00
Stephen Kelly 3ac4b90bfd cmPropertyMap: Require a non-empty name parameter. 
The cmGetPropertyCommand already checks for this.
 2015-06-07 09:29:30 +02:00
Stephen Kelly 7c0aa672fe cmPropertyMap: Remove scope parameter from API where not used. 2015-06-07 09:29:30 +02:00
Stephen Kelly 9058e27a43 Constify property definition API. 2015-06-07 09:29:30 +02:00
Stephen Kelly 1c48edf8fc cmProperty: Remove needless Name member. 
Size goes from 72 to 40 bytes with GNU libstdc++-5.1.
 2015-06-07 09:29:29 +02:00
Stephen Kelly 93cc2eef38 cmPolicies: Store all statuses in a single bitset. 
Currently there are an optimal number of policies (64) such that
there are no wasted bits.  When another policy is added, the
cmPolicyMap will grow from 40 bytes to 80, and occupy 45.  By storing
all in a single bitset, we stay under the cache line size of 64 bytes
until there are 512 policies in a range.
 2015-06-07 09:29:29 +02:00
Kitware Robot cb1a9c7b9c CMake Nightly Date Stamp 2015-06-07 00:01:03 -04:00
Stephen Kelly f573bd22e4 cmLocalGenerator: Add Feature API from cmMakefile. 2015-06-06 15:44:17 +02:00
Stephen Kelly ccbc225913 cmGeneratorTarget: Move Feature API from cmTarget. 2015-06-06 15:44:16 +02:00
Stephen Kelly 44a8115797 cmPolicies: Replace UNDEFINED bitset with WARN bitset. 
Might as well use the existing concept.
 2015-06-06 10:09:45 +02:00
Stephen Kelly 1981c9718b cmMakefile: Simplify InitializeFromParent method. 
Provide a parent instead of requiring it to be computed through
the cmLocalGenerator.
 2015-06-06 09:35:55 +02:00
Stephen Kelly 353e422b2a cmMakefile: Remove unused GetPolicies method. 2015-06-06 09:35:55 +02:00
Stephen Kelly 00bfa04748 cmMakefile: Out-of-line the cmMakefileCall. 2015-06-06 09:31:16 +02:00
Stephen Kelly db74ce5820 cmMakefile: Inline PushScope into PushFunctionScope. 
Make it possible to group the various methods here a different way.
 2015-06-06 09:30:45 +02:00
Stephen Kelly 59e21ffa13 Port static calls from cmLocalGenerator to cmOutputConverter. 2015-06-06 09:15:58 +02:00
Stephen Kelly 242dcc2c22 cmListFileBacktrace: Replace local generator with cmState::Snapshot. 
Construct cmOutputConverter only when needed.
 2015-06-06 09:15:57 +02:00
Stephen Kelly 1cff330b0f cmTarget: Port to cmOutputConverter. 2015-06-06 09:15:57 +02:00
Stephen Kelly 2f1bd62b23 cmCustomCommandGenerator: Port to cmOutputConverter. 2015-06-06 09:15:57 +02:00
Stephen Kelly 0f2a132437 cmCommandArgumentParserHelper: Port to cmOutputConverter. 2015-06-06 09:15:56 +02:00
Stephen Kelly 4d8b79ad7e cmComputeLinkInformation: Port to cmOutputConverter. 2015-06-06 09:15:56 +02:00
Stephen Kelly 8680520fea cmMakefile: Make the cmState::Snapshot accessible. 2015-06-06 09:15:56 +02:00
Stephen Kelly 6d7abb6326 cmOutputConverter: Extract from cmLocalGenerator. 
The Convert methods never belonged to the local generator concept, so
split them out now.  The cmOutputConverter is cheap to construct and
destroy, so it can be instantiated where needed to perform
conversions.  This will allow further decoupling of cmLocalGenerator
from the configure step.

Inherit cmLocalGenerator from cmOutputConverter for the purpose of
source compatibility.
 2015-06-06 09:15:55 +02:00
Kitware Robot 50a1bd3df1 CMake Nightly Date Stamp 2015-06-06 00:01:04 -04:00
Brad King 092f1539af Merge topic 'update-kwsys' 
bccbe281 Merge branch 'upstream-kwsys' into update-kwsys
6cafd8ed KWSys 2015-06-03 (8533a79b)
 2015-06-05 08:28:39 -04:00
Nils Gladitz cdf2cba3e7 VS: Use cmUuid RFC 4122 compliant hash based UUID generation 2015-06-05 09:17:17 +02:00
Kitware Robot 8d0347b571 CMake Nightly Date Stamp 2015-06-05 00:01:10 -04:00
Stephen Kelly ca140c2e89 cmMakefile: Create a unified raii for macro scopes. 2015-06-04 22:08:23 +02:00
Stephen Kelly d5dc4169ac cmMakefile: Create a unified raii for function scopes. 2015-06-04 22:08:23 +02:00
Stephen Kelly 4e5c70abe2 cmState: Extract a cmLinkedTree container adaptor. 
This will be used to contain most of the content of the cmState
in several different trees.  Refer to the BuildsystemDirectory
state from the SnapshotData state.  Currently these trees have
the same structure, but that will change when we have more snapshot
types.
 2015-06-04 21:20:59 +02:00
Stephen Kelly 7b9c75860d cmState: Group BuildsystemDirectory state together in a struct. 
It needs to be snapshotted independently of other state.
 2015-06-04 20:44:37 +02:00
Stephen Kelly 1b323949fe cmState: Extend Snapshot concept with a SnapshotType. 
Store it together with the Parent position.
 2015-06-04 20:44:37 +02:00
Stephen Kelly a824415724 cmState::Snapshot: Provide accessor for the cmState. 2015-06-04 20:20:25 +02:00
Stephen Kelly 1f4ef39603 cmLocalGenerator: Remove some commented lines of code. 
They've been commented out for a decade, which seems long enough.
 2015-06-04 19:25:37 +02:00
Brad King bccbe281ff Merge branch 'upstream-kwsys' into update-kwsys 2015-06-04 09:22:53 -04:00
Brad King 0886880e3b Merge topic 'cmMakefile-Configure' 
7657e8b1 cmMakefile: Introduce a local cmMakefile variable.
4e8f242d cmMakefile: Store unconfigured cmMakefiles.
d65e0123 cmMakefile: Implement ConfigureSubDirectory in terms of cmMakefile.
f059ed16 cmMakefile: Move Configure responsibility from cmLocalGenerator.
a653611d cmake: Replace CurrentLocalGenerator concept with CurrentMakefile.
69a038a9 cmMakefile: Refactor directories specified with the subdirs command.
08637970 cmLocalGenerator: ComputeObjectMaxPath just before generating.
27e11c6f Merge Configure state with GeneratingBuildSystem state.
363caa2f cmLocalGenerator: De-virtualize Configure().
 2015-06-04 09:13:35 -04:00
Brad King d6fe79f3ab Merge topic 'remove-CMAKE_USE_RELATIVE_PATHS' 
6e570f85 cmLocalGenerator: Remove 'optional' parameter from Convert.
3d8c6cd9 cmLocalGenerator: Remove obsolete method.
e44e6bcc Port away from obsolete method.
1335992c Remove CMAKE_USE_RELATIVE_PATHS variable.
 2015-06-04 09:13:33 -04:00
Brad King 5a1c8806bf Merge topic 'rename-cmState-API' 
cf1233a0 cmState: Rename GetParent method.
942df88b cmState: Rename CreateSnapshot method.
da28f115 cmState: Add CreateBaseSnapshot method.
 2015-06-04 09:13:31 -04:00
Brad King b49aef6b10 Merge topic 'minor-cleanups' 
eb7b6f6d cmVariableWatchCommand: Simplify error reporting.
499ebb65 cmListFileBacktrace: Internalize the step of making paths relative.
80b433b0 cmGlobalGenerator: Don't use else after a return.
52919ac8 cmMakefile: Make cmListFileBacktrace default constructible.
b68f2ea8 cmMakefile: Add API for elseif to create backtrace.
17e13f0a cmMakefile: Simplify CMP0000 handling.
 2015-06-04 09:13:27 -04:00
Brad King 94070b8dfa Merge topic 'ctest-merge-test-output' 
721b7e3e CTest: Capture test stdout/stderr through one pipe (#15600)
 2015-06-04 09:13:25 -04:00
Brad King 2b083b19eb Merge topic 'vs-deterministic-guid' 
c85367f4 VS: Compute project GUIDs deterministically
 2015-06-04 09:13:23 -04:00
Stephen Kelly 7657e8b1df cmMakefile: Introduce a local cmMakefile variable. 2015-06-04 09:06:42 -04:00
Stephen Kelly 4e8f242d17 cmMakefile: Store unconfigured cmMakefiles. 
Not cmLocalGenerators.
 2015-06-04 09:06:42 -04:00
Stephen Kelly d65e01235d cmMakefile: Implement ConfigureSubDirectory in terms of cmMakefile. 2015-06-04 09:06:42 -04:00
Stephen Kelly f059ed165b cmMakefile: Move Configure responsibility from cmLocalGenerator. 
The generator should only have a function at generate time.
 2015-06-04 09:06:41 -04:00
Stephen Kelly a653611db0 cmake: Replace CurrentLocalGenerator concept with CurrentMakefile. 2015-06-04 09:06:41 -04:00
Stephen Kelly 69a038a9e9 cmMakefile: Refactor directories specified with the subdirs command. 
Store the directories on the cmMakefile as explicitly not-configured-yet.
 2015-06-04 09:06:41 -04:00
Stephen Kelly 0863797037 cmLocalGenerator: ComputeObjectMaxPath just before generating. 2015-06-04 09:06:41 -04:00
Stephen Kelly 27e11c6fea Merge Configure state with GeneratingBuildSystem state. 2015-06-04 09:06:40 -04:00
Stephen Kelly 363caa2fa5 cmLocalGenerator: De-virtualize Configure(). 
The generators that override it do so in order to populate
data members which can instead be populated in Generate().
 2015-06-04 09:06:40 -04:00
Stephen Kelly 6e570f857a cmLocalGenerator: Remove 'optional' parameter from Convert. 
Port callers away from it.
 2015-06-04 09:06:09 -04:00
Brad King c85367f408 VS: Compute project GUIDs deterministically 
Compute deterministic GUIDs that are unique to the build tree by
hashing the path to the build tree with the GUID logical name.
Avoid storing them in the cache, but honor any found there.
This will allow project GUIDs to be reproduced in a fresh build
tree so long as its path is the same as the original, which may
be useful for incremental builds.
 2015-06-04 08:40:08 -04:00
Kitware Robot 0cc7c9a743 CMake Nightly Date Stamp 2015-06-04 00:01:06 -04:00
Stephen Kelly 3d8c6cd964 cmLocalGenerator: Remove obsolete method. 2015-06-03 11:44:26 -04:00
Stephen Kelly e44e6bcc04 Port away from obsolete method. 2015-06-03 11:44:26 -04:00
Stephen Kelly 1335992c8f Remove CMAKE_USE_RELATIVE_PATHS variable. 
The test for this variable was removed in commit v2.8.8~330^2~7 (complex:
Remove ancient unused ComplexRelativePaths test, 2011-12-23).

Commit v3.1.0-rc1~425^2~2 (backtrace: Convert to local paths in
IssueMessage, 2014-03-12) appears to have accidentally made some backtraces
print relative paths with the variable because conversions which used to be
done at configure time, before the variable had an effect are now potentially
done at generate time.

The documentation of the variable says not to use it, and the docs are wrong in
that the variable actually applies in per-directory scope.

The read of the variable makes it harder to split conversion methods from
cmLocalGenerator where they don't belong.  Remove it now.
 2015-06-03 11:43:31 -04:00
Brad King 721b7e3e56 CTest: Capture test stdout/stderr through one pipe (#15600) 
Use the KWSys Process "MergeOutput" option to give each test child
process the same pipe for both stdout and stderr.  This allows natural
merging of stdout and stderr together instead of merging on arbitrary
buffered read boundaries as before.
 2015-06-03 08:47:49 -04:00
Kitware Robot 758392f51f CMake Nightly Date Stamp 2015-06-03 00:01:08 -04:00
Stephen Kelly cf1233a0ea cmState: Rename GetParent method. 
Leave the namespace open for other Parent types.
 2015-06-03 01:15:03 +02:00
Stephen Kelly 942df88bf8 cmState: Rename CreateSnapshot method. 
Leave the namespace open for other snapshot types.
 2015-06-03 01:14:34 +02:00