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

28573 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King
bddfe77d12 Merge topic 'qt-autogen-always-run' 
2bf22a4b QtAutogen: Add comment explaining why rcc cannot use PRE_BUILD
0e346427 QtAutogen: Always run autogen step even when rcc is enabled (#15608)
 2015-06-23 09:08:15 -04:00
Brad King
2bf22a4b90 QtAutogen: Add comment explaining why rcc cannot use PRE_BUILD 2015-06-23 09:05:30 -04:00
Kitware Robot
6ccb534df3 CMake Nightly Date Stamp 2015-06-23 00:01:05 -04:00
Brad King
ec6d6be57d Merge topic 'minor-cleanups' 
820986ed cmLocalGenerator: Constify GetIncludeDirectories method.
b3e2e332 QtAutogen: Get the global generator from the Makefile.
61c0113c cmLocalUnixMakefileGenerator3: Remove unused method.
080489b8 cmMakefile: Use member directly instead of through method.
8bfaadfa cmMakefile: Move IsRoot API from cmLocalGenerator.
217c243d cmake: Update the current snapshot when Resetting.
eb05dcd6 cmLocalGenerator: Add IssueMessage method.
cfae7fa4 cmMakefile: Use cmOutputConverter instead of cmLocalGenerator.
ccf7760f cmOutputConverter: Constify API.
 2015-06-22 13:00:32 -04:00
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
91611c39eb Merge topic 'fix-Qt5Autogen-test' 
6af9fa12 Tests: Don't hang when running Qt5Autogen built with GCC 5 (#15570).
 2015-06-22 13:00:27 -04:00
Brad King
8848298831 Merge topic 'doc-cmake-buildsystem-typo' 
17c51521 Help: Fix a typo in cmake-buildsystem(7) manual
 2015-06-22 13:00:25 -04:00
Erik Sjölund
17c5152170 Help: Fix a typo in cmake-buildsystem(7) manual 
Add the property name INTERFACE_INCLUDE_DIRECTORIES that was missing
from a set_property command.
 2015-06-22 09:02:55 -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
Stephen Kelly
6af9fa1294 Tests: Don't hang when running Qt5Autogen built with GCC 5 (#15570). 
Since Qt 5.4.2, it is necessary to compile against Qt 5 with -fPIC
and not -fPIE when using GCC 5.  Not doing so results in a hanging
test in this case, so use the PIC flag directly instead.
 2015-06-21 14:50:50 +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
Brad King
664156c231 Merge branch 'release' 2015-06-19 08:56:35 -04:00
Brad King
41cd8547c4 Merge topic 'GNUInstallDirs-special-prefixes' 
8bcec4d2 Help: Add notes for topic 'GNUInstallDirs-special-prefixes'
c8bd37ec GNUInstallDirs: Add special cases for certain prefixes
5f30f175 GNUInstallDirs: Add test cases
 2015-06-19 08:51:45 -04:00
Brad King
a53f1af79f Merge topic 'ConcurrentFortran-compiler-id' 
54676a0e Help: Add notes for topic 'ConcurrentFortran-compiler-id'
7cd539b1 Add support for Concurrent Fortran 77 Compiler
0d204c1c CMakeDetermineCompilerId: Try matching compiler output to detect id
5f0dad75 CMakeDetermineCompilerId: Refactor id build/check loop logic
c65a060e CMakeDetermineCompilerId: Optionally try some flags before no flags
 2015-06-19 08:51:43 -04:00