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

18229 Commits

Author SHA1 Message Date
Stephen Kelly f4300cd4dd cmTarget: Simplify output computation. 
We always have line information for contexts resulting from
command execution.
 2015-05-18 23:55:44 +02:00
Stephen Kelly 65a4284963 cmTarget: Store context in stack only if different. 
The PushTLLCommandTrace method is called once per link item for a single
target_link_libraries command.  Avoid storing copies of identical
execution contexts and rely on the uniqueness while printing output.
 2015-05-18 23:55:44 +02:00
Stephen Kelly 9645cba3bf cmListFileContext: Implement EqualityComparable. 2015-05-18 23:55:44 +02:00
Stephen Kelly 52a8d19c9b cmTarget: Store only cmListFileContext for CMP0023 handling. 
Only the top level execution context is shown, as appropriate, so
store only that.
 2015-05-18 23:55:43 +02:00
Stephen Kelly 59ba1215b9 cmTarget: Remove needless iteration. 
This is not a loop.
 2015-05-18 23:55:43 +02:00
Stephen Kelly 18f810a865 cmListFileContext: Sort by line before file. 
This should be much faster.  In the context where it is used the
line comparison should be sufficient, removing the need to compare
files at all.
 2015-05-18 23:55:43 +02:00
Stephen Kelly e96b5d14f9 cmListFileContext: Implement LessThanComparable. 
Move wrapping existing code from cmMakefile, and simplify the
implementation there.
 2015-05-18 23:55:43 +02:00
Stephen Kelly 7eb0dfa062 cmMakefile: Use std::set::insert API to simplify CMP0054 handling. 2015-05-18 23:55:43 +02:00
Stephen Kelly f9785e0cb6 cmMakefile: Simplify CMP0054 handling. 2015-05-18 23:55:43 +02:00
Stephen Kelly e17b5e4262 cmMakefile: Add access to the top-level execution context. 
This is cheaper than getting the whole backtrace, and the cmListFileBacktrace
will not always be composed of cmListFileContext objects.
 2015-05-18 23:55:41 +02:00
Stephen Kelly 9b4aefad41 cmMakefile: Replace deques with vectors. 2015-05-18 21:25:48 +02:00
Brad King 00ccfff2bc Merge topic 'cpack-ifw-updates' 
342d15cb Update packaging of CMake for QtIFW 2.0
9a0ba4d2 CPackIFW: Add QtIFW 2.0 support
 2015-05-18 09:56:17 -04:00
Kitware Robot 09a3d21d71 CMake Nightly Date Stamp 2015-05-18 00:01:06 -04:00
Kitware Robot fa85829712 CMake Nightly Date Stamp 2015-05-17 00:01:11 -04:00
Kitware Robot ebf8a41984 CMake Nightly Date Stamp 2015-05-16 00:01:07 -04:00
Brad King 2e4ea0c055 Merge topic 'refactor-cmLocalGenerator' 
ce167b54 cmMakefile: Handle CMP0014 before configuring the generator.
7baef756 cmLocalGenerator: Assert that there is a parent.
63255342 cmMakefile: Remove redundant variable set.
894961af cmMakefile: Use the state to determine the parent directory.
115e9199 Use new top-level check abstraction.
c5059c90 cmLocalGenerator: Add abstraction to check if top-level.
b17686d2 cmGlobalGenerator: Move some flags from cmLocalGenerator.
ed41a8e7 cmLocalGenerator: Port loops to cmState::Snapshot.
48a9e91b cmState: Add an accessor for Parent snapshot and a validity check.
e7f7c2e2 cmLocalGenerator: Convert two recursive methods to loops.
c5cb3a73 cmLocalGenerator: Get project directories from the cmState.
76b59831 cmLocalGenerator: Initialize state before creating cmMakefile.
34c9ee2e cmLocalGenerator: Require a global generator in the constructor.
3837c483 Tests: Add case for 'ctest' run with bad CTestTestfile
b317b38d cmGlobalBorlandMakefileGenerator: Do not inherit from NMake generator
94867698 Don't use a cmLocalGenerator instance to call static methods.
...
 2015-05-15 11:22:36 -04:00
Brad King 912dff6253 Merge topic 'disallow-install-of-export' 
b85d3b66 install: Disallow installing export() result.
501c237a install: Use an intermediate filesVector variable.
 2015-05-15 11:22:29 -04:00
Konstantin Podsvirov 342d15cbc2 Update packaging of CMake for QtIFW 2.0 2015-05-15 11:02:49 -04:00
Konstantin Podsvirov 9a0ba4d24a CPackIFW: Add QtIFW 2.0 support 
Add variables:

- CPACK_IFW_FRAMEWORK_VERSION
- CPACK_IFW_PACKAGE_ALLOW_NON_ASCII_CHARACTERS
- CPACK_IFW_PACKAGE_ALLOW_SPACE_IN_PATH
- CPACK_IFW_PACKAGE_CONTROL_SCRIPT
- CPACK_IFW_PACKAGE_MAINTENANCE_TOOL_INI_FILE
- CPACK_IFW_PACKAGE_MAINTENANCE_TOOL_NAME
- CPACK_IFW_PACKAGE_START_MENU_DIRECTORY
- CPACK_IFW_VERBOSE
 2015-05-15 11:02:49 -04:00
Kitware Robot f6a41a4414 CMake Nightly Date Stamp 2015-05-15 00:01:06 -04:00
Stephen Kelly b85d3b66c6 install: Disallow installing export() result. 2015-05-14 21:38:29 +02:00
Stephen Kelly ce167b546d cmMakefile: Handle CMP0014 before configuring the generator. 2015-05-14 21:26:13 +02:00
Stephen Kelly 7baef75649 cmLocalGenerator: Assert that there is a parent. 
If the CMakeLists.txt file does not exist, there must be a parent.
The case for the top-level of the project is already handled in
cmake::DoPreConfigureChecks.
 2015-05-14 21:04:17 +02:00
Stephen Kelly 63255342c6 cmMakefile: Remove redundant variable set. 
The variable is initialized by the constructor already.
 2015-05-14 20:57:24 +02:00
Stephen Kelly 894961af16 cmMakefile: Use the state to determine the parent directory. 
Do not depend on the local generator for that.
 2015-05-14 20:57:21 +02:00
Stephen Kelly 115e919982 Use new top-level check abstraction. 2015-05-14 20:47:36 +02:00
Stephen Kelly c5059c9000 cmLocalGenerator: Add abstraction to check if top-level. 
Move from the cmLocalNinjaGenerator.  Fix the case of the name.
 2015-05-14 20:44:55 +02:00
Stephen Kelly b17686d2bb cmGlobalGenerator: Move some flags from cmLocalGenerator. 
These flags are global, and so they belong here instead of being
set on each local generator.
 2015-05-14 20:36:28 +02:00
Stephen Kelly ed41a8e7b4 cmLocalGenerator: Port loops to cmState::Snapshot. 
Make this code less dependent on being part of cmLocalGenerator,
where it doesn't really belong.
 2015-05-14 20:36:28 +02:00
Stephen Kelly 48a9e91b02 cmState: Add an accessor for Parent snapshot and a validity check. 2015-05-14 20:36:28 +02:00
Stephen Kelly e7f7c2e208 cmLocalGenerator: Convert two recursive methods to loops. 2015-05-14 20:36:28 +02:00
Stephen Kelly c5cb3a734d cmLocalGenerator: Get project directories from the cmState. 
Make this class and cmMakefile less interdependent.
 2015-05-14 20:36:28 +02:00
Stephen Kelly 76b598319f cmLocalGenerator: Initialize state before creating cmMakefile. 
Access the state from the local generator in the cmMakefile.
 2015-05-14 20:36:28 +02:00
Stephen Kelly 34c9ee2ed7 cmLocalGenerator: Require a global generator in the constructor. 
Port generator factory methods to pass it.
 2015-05-14 20:36:27 +02:00
Brad King b317b38d33 cmGlobalBorlandMakefileGenerator: Do not inherit from NMake generator 
The Borland generator re-implements every method the NMake generator
does, so there is no reason to inherit this way.  Instead inherit
directly from cmGlobalUnixMakefileGenerator3 like all the other
makefile generators do.
 2015-05-14 20:30:55 +02:00
Stephen Kelly 9486769866 Don't use a cmLocalGenerator instance to call static methods. 2015-05-14 20:30:09 +02:00
Stephen Kelly a3139d4b15 cmLocalGenerator: Remove EscapeForShellOldStyle to only caller. 2015-05-14 20:30:09 +02:00
Stephen Kelly 443f041c2f cmLocalGenerator: Remove unused members. 2015-05-14 20:30:09 +02:00
Stephen Kelly 501c237a83 install: Use an intermediate filesVector variable. 
Reduce noise.
 2015-05-14 18:23:43 +02:00
Brad King 36c275d857 Merge topic 'update-kwsys' 
576ef8c5 KWSys: Tell Git not to export .gitattributes
c9709dff Merge branch 'upstream-kwsys' into update-kwsys
3b815ed2 KWSys 2015-05-12 (b1d560a0)
 2015-05-14 10:27:44 -04:00
Kitware Robot ee58e94d62 CMake Nightly Date Stamp 2015-05-14 00:01:05 -04:00
Brad King 576ef8c56e KWSys: Tell Git not to export .gitattributes 
KWSys upstream added an attribute to export .gitattributes so that
importing snapshots into the sources of other projects would bring along
the attributes.  However, we don't want to export them from CMake.
Drop .gitattributes entries not relevant to CMake.
 2015-05-13 12:54:49 -04:00
Brad King c9709dffb0 Merge branch 'upstream-kwsys' into update-kwsys 2015-05-13 08:29:21 -04:00
Kitware Robot a6a9710fca CMake Nightly Date Stamp 2015-05-13 00:01:06 -04:00
Brad King 53bb51fc31 Merge topic 'ctest-no-make-i' 
226df303 CTest: Stop telling 'make' to ignore errors with -i
28e7a135 Help: Fix build_command alternative signature docs
231601b6 build_command: Choose configuration consistently across signatures
 2015-05-12 09:12:56 -04:00
Brad King ffd5d09225 Merge topic 'find_package-no-cmake-gui-paths' 
1506f9ca find_package: Drop search in recent cmake-gui locations
8d484463 FindFLTK: Drop search in recent cmake-gui locations
 2015-05-12 09:12:50 -04:00
Brad King 16d84111da Merge topic 'detect-c++14-missing-gets' 
3307e10f Avoid using C++14 to build CMake if cstdio breaks
 2015-05-12 09:12:48 -04:00
Brad King cca3bbde98 Merge topic 'ninja-gcc-windows' 
cf8ce7a3 RC: Do not override MinGW Makefiles generator preference
ca658a45 Ninja: Use forward slashes for linking with any GCC on Windows (#15439)
 2015-05-12 09:12:41 -04:00
Brad King 226df303f9 CTest: Stop telling 'make' to ignore errors with -i 
Add policy CMP0061 to maintain compatibility for existing projects.
 2015-05-12 09:06:49 -04:00
Brad King 231601b696 build_command: Choose configuration consistently across signatures 
Teach the legacy two-argument signature to use CMAKE_CONFIG_TYPE
from the environment only if it is non-empty.  This makes behavior
consistent with the main signature.
 2015-05-12 09:06:48 -04:00