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

18773 Commits

Author SHA1 Message Date
Brad King
24a0825585 Merge topic 'clean-up-ReadListFile' 
81eb2c58 cmMakefile: Simplify filename handling.
5c837686 cmMakefile: Make the IncludeScope more responsible.
c10ab014 cmMakefile: Move IncludeScope.
3404f8a0 cmMakefile: Move ListFile parsing responsibility out of internal method.
a1858136 cmMakefile: Rename parameter.
ad47e6e5 cmMakefile: Inline ReadListFileInternal into caller.
254be613 cmMakefile: Move resource management into the IncludeScope.
826b6e68 cmMakefile: Move IncludeScope to ReadDependentFile.
e53072d6 cmMakefile: Move IncludeScope instance.
b7166afa cmMakefile: Remove File from IncludeScope.
27f229b9 cmMakefile: Move include scope out of ReadListFileInternal.
9166b49d cmMakefile: Change order of raii scopes.
384a0dba cmMakefile: Simplify condition handling.
5e24ff17 cmMakefile: Split file handling from execution.
d5aaa2b9 cmMakefile: Move check for unused variables.
fff3c6cd cmMakefile: Move a container population.
...
 2015-06-22 13:00:30 -04:00
Brad King
c7180e822b Merge topic 'clean-up-cmListFileArgument' 
782657db cmListFileArgument: Remove FilePath member.
a863c59f cmMakefile: Use GetExecutionFileStack method.
076760a6 cmMakefile: Add filename context to ExpandArguments.
569f4785 cmFunctionCommand: Store the FilePath when creating the prototype.
f971ab04 cmMacroCommand: Store the FilePath when creating the prototype.
 2015-06-22 13:00:29 -04:00
Brad King
38ee28bfd5 Merge branch 'fix-function-missing-end' into release 2015-06-22 11:46:09 -04:00
Brad King
5d85fb4f40 Fix assertion failure on unmatched function or macro 
The fix in commit v3.2.3~3^2 (Fix assertion failure on unmatched foreach
in function, 2015-05-18) broke handling of unmatched non-loop blocks
because it assumed all function blockers removed during error unwinding
were for loops, essentially switching the set of mishandled cases.

The purpose of the loop block push/pop operations is to define a scope
matching the lifetime of the loop function blockers.  Since our function
blockers already have the proper lifetime, simply move the push/pop
operations to their constructor/destructor.

Extend the RunCMake.Syntax test with a case covering this.
 2015-06-22 11:41:51 -04:00
Kitware Robot
f4144af905 CMake Nightly Date Stamp 2015-06-22 00:01:04 -04:00
Stephen Kelly
820986edff cmLocalGenerator: Constify GetIncludeDirectories method. 2015-06-21 21:14:09 +02:00
Stephen Kelly
b3e2e332eb QtAutogen: Get the global generator from the Makefile. 2015-06-21 21:14:08 +02:00
Stephen Kelly
61c0113c13 cmLocalUnixMakefileGenerator3: Remove unused method. 2015-06-21 21:14:07 +02:00
Stephen Kelly
080489b8a9 cmMakefile: Use member directly instead of through method. 
This function will not be around much longer anyway.
 2015-06-21 21:14:06 +02:00
Stephen Kelly
8bfaadfa39 cmMakefile: Move IsRoot API from cmLocalGenerator. 2015-06-21 21:14:05 +02:00
Stephen Kelly
782657db48 cmListFileArgument: Remove FilePath member. 
It is now unused.
 2015-06-21 20:57:26 +02:00
Stephen Kelly
a863c59f70 cmMakefile: Use GetExecutionFileStack method. 2015-06-21 20:57:25 +02:00
Stephen Kelly
076760a63c cmMakefile: Add filename context to ExpandArguments. 
The cmListFileArgument currently stores a FilePath for use in this
method.  The filename is the same as the CMAKE_CURRENT_LIST_FILE,
except if executing a macro or function defined in another file.

Set the context filename when expanding the arguments of macros and
functions using the filename recorded when defining the prototype.
 2015-06-21 20:57:25 +02:00
Stephen Kelly
569f478537 cmFunctionCommand: Store the FilePath when creating the prototype. 2015-06-21 20:31:28 +02:00
Stephen Kelly
f971ab04cf cmMacroCommand: Store the FilePath when creating the prototype. 
Instead of setting it each time the macro is invoked.
 2015-06-21 20:31:27 +02:00
Stephen Kelly
217c243db0 cmake: Update the current snapshot when Resetting. 
This will matter when definitions are stored in the cmState.
 2015-06-21 20:19:53 +02:00
Stephen Kelly
eb05dcd6c9 cmLocalGenerator: Add IssueMessage method. 
For use at generate-time instead of the cmMakefile method of the same name.
 2015-06-21 20:17:59 +02:00
Stephen Kelly
cfae7fa408 cmMakefile: Use cmOutputConverter instead of cmLocalGenerator. 2015-06-21 20:17:18 +02:00
Stephen Kelly
ccf7760f00 cmOutputConverter: Constify API. 2015-06-21 20:13:28 +02:00
Stephen Kelly
81eb2c58a1 cmMakefile: Simplify filename handling. 
This method has only one caller.
 2015-06-21 20:10:52 +02:00
Stephen Kelly
5c83768628 cmMakefile: Make the IncludeScope more responsible. 
It is now responsible for all resource management when
including a file.
 2015-06-21 20:10:52 +02:00
Stephen Kelly
c10ab01434 cmMakefile: Move IncludeScope. 2015-06-21 20:10:52 +02:00
Stephen Kelly
3404f8a081 cmMakefile: Move ListFile parsing responsibility out of internal method. 2015-06-21 20:10:51 +02:00
Stephen Kelly
a1858136c2 cmMakefile: Rename parameter. 2015-06-21 20:10:51 +02:00
Stephen Kelly
ad47e6e5bc cmMakefile: Inline ReadListFileInternal into caller. 2015-06-21 20:10:50 +02:00
Stephen Kelly
254be613b8 cmMakefile: Move resource management into the IncludeScope. 2015-06-21 20:10:50 +02:00
Stephen Kelly
826b6e6818 cmMakefile: Move IncludeScope to ReadDependentFile. 
Add replacement simple push/pop in the other two callers of
ReadListFile.
 2015-06-21 20:10:50 +02:00
Stephen Kelly
e53072d638 cmMakefile: Move IncludeScope instance. 2015-06-21 20:10:49 +02:00
Stephen Kelly
b7166afa6d cmMakefile: Remove File from IncludeScope. 
Get it from the Makefile instead.
 2015-06-21 20:10:49 +02:00
Stephen Kelly
27f229b970 cmMakefile: Move include scope out of ReadListFileInternal. 
Simplify the ReadListFileInternal API.
 2015-06-21 20:10:48 +02:00
Stephen Kelly
9166b49d70 cmMakefile: Change order of raii scopes. 2015-06-21 20:10:48 +02:00
Stephen Kelly
384a0dba63 cmMakefile: Simplify condition handling. 2015-06-21 20:10:48 +02:00
Stephen Kelly
5e24ff17a2 cmMakefile: Split file handling from execution. 2015-06-21 20:10:47 +02:00
Stephen Kelly
d5aaa2b96f cmMakefile: Move check for unused variables. 2015-06-21 20:10:47 +02:00
Stephen Kelly
fff3c6cd1c cmMakefile: Move a container population. 2015-06-21 20:10:47 +02:00
Stephen Kelly
a6e661b848 cmMakefile: Rename variables. 2015-06-21 20:10:46 +02:00
Stephen Kelly
fe38bb2c29 cmMakefile: Change return type of ReadListFileInternal. 2015-06-21 20:10:46 +02:00
Stephen Kelly
ac10fc0958 cmMakefile: Move listfile parsing responsibility. 2015-06-21 20:10:45 +02:00
Kitware Robot
155ef53597 CMake Nightly Date Stamp 2015-06-21 00:01:03 -04:00
Kitware Robot
4fa99b9922 CMake Nightly Date Stamp 2015-06-20 00:01:04 -04:00
Brad King
0e346427a2 QtAutogen: Always run autogen step even when rcc is enabled (#15608) 
In commit v3.2.0-rc1~480^2 (QtAutogen: Regenerate qrc files if their input
changes, 2014-09-17) the "cmake -E cmake_autogen" rule was switched from
always running to running as a custom command with dependencies if rcc
is enabled.  This is not correct because automoc always needs to re-run.
Switch back to always running the command.
 2015-06-19 10:29:38 -04:00
Kitware Robot
66a2675e2b CMake Nightly Date Stamp 2015-06-19 00:01:07 -04:00
Brad King
9223c6cb12 Merge topic 'update-kwsys' 
502430e3 Merge branch 'upstream-kwsys' into update-kwsys
da4cddd7 KWSys 2015-06-15 (d217407c)
 2015-06-18 09:05:19 -04:00
Kitware Robot
f17e89c004 CMake Nightly Date Stamp 2015-06-18 00:01:04 -04:00
Kitware Robot
ee5c40a5f8 CMake Nightly Date Stamp 2015-06-17 00:01:04 -04:00
Brad King
ee223dfa91 Merge topic 'fix-windows-preprocessor-checks' 
83af11d4 Fix preprocessor checks WIN32 => _WIN32
 2015-06-16 10:39:12 -04:00
Brad King
e5ed8b22cb Merge topic 'cmake--build-dir' 
90ad087a cmake: Fix --build <relative-dir> for VS generators (#15609)
7195ec92 Tests: Extend RunCMake.CommandLine to cover --build with no arg
 2015-06-16 10:39:10 -04:00
Brad King
502430e39c Merge branch 'upstream-kwsys' into update-kwsys 2015-06-16 08:49:12 -04:00
Kitware Robot
157396b131 CMake Nightly Date Stamp 2015-06-16 00:01:05 -04:00
Brad King
83af11d411 Fix preprocessor checks WIN32 => _WIN32 
The latter is predefined by Windows toolchains and is more reliable.

Reported-by: Michael Stürmer <michael.stuermer@schaeffler.com>
 2015-06-15 09:58:29 -04:00