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

20034 Commits

Author SHA1 Message Date
Kitware Robot 1ed0464851 CMake Nightly Date Stamp 2012-11-28 00:01:06 -05:00
Brad King ba139c5722 Merge branch 'release' 2012-11-27 13:38:16 -05:00
Brad King 5f30a56f29 Merge topic 'generator-expression-fixes' 
b581be0 Genex: Don't segfault on $<FOO,>
07749e3 Genex: Ensure that $<0:...> has a parameter.
ee96dc7 Genex: Extract a method to parse parameters.
 2012-11-27 13:35:02 -05:00
Brad King d5adbbcf9c Merge topic 'winflexbison' 
df29336 FindFLEX: Add support for the Win flex-bison distribution
e593f8a FindBISON: Add support for the Win flex-bison distribution
 2012-11-27 13:34:57 -05:00
Brad King dcb3701d76 Merge topic 'FindBullet-windows-configs' 
f180b24 FindBullet: Search in per-config dirs on Windows (#13738)
 2012-11-27 13:34:51 -05:00
Brad King 370a7c5f8c Merge topic 'fix-12437-remove-ridiculously-large-default-stack-size-arg' 
51af1da CMake: Remove "/STACK:10000000" from default linker flags (#12437)
 2012-11-27 13:34:46 -05:00
Brad King ccf23f295c Merge topic 'fix-13611-source-group-issues' 
00e9680 CMake: source_group needs to check its own regex after its children (#13611)
 2012-11-27 13:34:40 -05:00
Brad King 9f832033d5 Merge topic 'revert-use-generator-target' 
0bbae6f Revert "Move GetLinkInformation to cmGeneratorTarget"
d5cf644 Split link information processing into two steps.
d8a59ea Port cmGeneratorExpression to cmTarget from cmGeneratorTarget.
 2012-11-27 13:34:36 -05:00
Brad King 9c48fc7213 Merge topic 'fix-13392-nmake-empty-depends-problem' 
7ae7d66 NMake: Fix problem with empty DEPENDS args (#13392)
078e35d NMake: Add a test to demonstrate EmptyDepends issue (#13392)
 2012-11-27 13:34:31 -05:00
Brad King 4046fc0104 Merge topic 'use-cmsys-auto_ptr' 
ddc0520 Always use the auto_ptr from cmsys.
 2012-11-27 13:34:25 -05:00
Brad King 9e395feb46 Merge topic 'ninja-encode-LINK_FLAGS' 
12ab135 Ninja: encode LINK_FLAGS to handle bash variables
 2012-11-27 13:34:21 -05:00
Brad King f30393e28a Merge topic 'cpack-nsis64-patches' 
6ff730a CPack/NSIS: Add support for 64-bit NSIS (#13203)
51da766 CPack/NSIS: Fix compatibility issues with prerelease NSIS (#13202)
 2012-11-27 13:34:13 -05:00
Brad King 805c0f3f89 Merge topic 'fix-untar-infinite-loop' 
37c34d7 CMake: Fix infinite loop untarring corrupt tar file
 2012-11-27 13:34:07 -05:00
Brad King 7e5f1e2cbd Merge topic 'fix-FindGettext-result' 
a7be253 FindGettext: fix overwriting result with empty variable (#13691)
 2012-11-27 13:33:56 -05:00
Stephen Kelly b581be0767 Genex: Don't segfault on $<FOO,> 
Treat the comma as part of the identifier here. It will later not
resolve to a generator expression and the user gets a proper error
message.
 2012-11-27 09:12:39 -05:00
Stephen Kelly 07749e3705 Genex: Ensure that $<0:...> has a parameter. 2012-11-27 09:12:39 -05:00
Kitware Robot 075e0daabc CMake Nightly Date Stamp 2012-11-27 00:01:05 -05:00
Stephen Kelly ee96dc7686 Genex: Extract a method to parse parameters. 2012-11-26 22:52:22 +01:00
Patrick Gansterer df29336893 FindFLEX: Add support for the Win flex-bison distribution 
Search for win_flex too and improve version parsing.
 2012-11-26 16:30:05 -05:00
Patrick Gansterer e593f8a1cf FindBISON: Add support for the Win flex-bison distribution 
Search for win_bison too.
 2012-11-26 16:29:38 -05:00
Brad King 1d3b35fd8a CMake 2.8.10.2 2012-11-26 13:04:20 -05:00
Brad King 82b077395d Merge branch 'fix-untar-infinite-loop' into release 2012-11-26 11:56:31 -05:00
David Cole 37c34d7d7b CMake: Fix infinite loop untarring corrupt tar file 
Suggested-by: Robert Maynard <robert.maynard@kitware.com>
 2012-11-26 11:54:38 -05:00
Brad King 84740c7448 Merge branch 'fix-FindGettext-result' into release 2012-11-26 10:22:12 -05:00
Brad King c8c1745495 Merge branch 'fix-IMPORTED-GLOBAL-reconfigure' into release 2012-11-26 10:22:05 -05:00
Alan Witkowski f180b24ef4 FindBullet: Search in per-config dirs on Windows (#13738) 
Bullet for windows installs in these per-config paths.
 2012-11-26 09:08:14 -05:00
Brad King 4d078ab460 Merge branch 'FixAutomocRegression3' into release 2012-11-26 09:02:25 -05:00
Rolf Eike Beer a7be253418 FindGettext: fix overwriting result with empty variable (#13691) 
Remove stray line left by commit 656ab19b (FindGettext: remove code
duplicating FPHSA checks, 2012-09-08).
 2012-11-26 08:57:13 -05:00
Kitware Robot e574852120 CMake Nightly Date Stamp 2012-11-26 00:01:06 -05:00
Kitware Robot 6aa02d24c7 CMake Nightly Date Stamp 2012-11-25 00:01:07 -05:00
Kitware Robot 79357448ce CMake Nightly Date Stamp 2012-11-24 00:01:04 -05:00
David Cole 51af1da3d2 CMake: Remove "/STACK:10000000" from default linker flags (#12437) 
Modern apps that use multiple threads do NOT want 10 Megabytes of RAM
per thread being used for each thread's stack... Just leave off the
/STACK: argument, and let the compiler use a reasonable default value
for the stack size.

If existing single-threaded apps require the /STACK: argument because
they do need a very large stack size, they can add the flag in their
own CMakeLists files.
 2012-11-23 11:41:58 -05:00
Clemens Heppner 00e96808aa CMake: source_group needs to check its own regex after its children (#13611) 
Otherwise, regexes that descend into sub-folders do not get grouped correctly.
 2012-11-23 10:57:13 -05:00
Kitware Robot 0499f93716 CMake Nightly Date Stamp 2012-11-23 00:01:05 -05:00
Kitware Robot 976cfddae8 CMake Nightly Date Stamp 2012-11-22 00:01:05 -05:00
David Cole 7ae7d66503 NMake: Fix problem with empty DEPENDS args (#13392) 
add_custom_command can have empty DEPENDS arguments, which
was triggering invalid makefile generation for the NMake
Makefiles generator. We were mistakenly emitting the build
directory appended with "/" plus the empty string... which
was then translated to a string ending in \" in build.make...
which nmake choked on.

The solution is not to emit any dependency when the input
DEPENDS is the empty string. Return early from GetRealDependency
in this empty input case.
 2012-11-21 11:29:38 -05:00
David Cole 078e35defb NMake: Add a test to demonstrate EmptyDepends issue (#13392) 2012-11-21 11:29:10 -05:00
Stephen Kelly 0bbae6f95f Revert "Move GetLinkInformation to cmGeneratorTarget" 
As we can't move all linking related code from cmTarget, it makes
sense to reverse the move in some cases.

This reverts commit 4f5384e75c.
 2012-11-21 15:49:37 +01:00
Stephen Kelly d5cf644ac2 Split link information processing into two steps. 
The first step can be ported to use the generator expression API,
while the second can not. This is for compatibility with CMP0003.
 2012-11-21 15:49:36 +01:00
Kitware Robot b336d9a049 CMake Nightly Date Stamp 2012-11-21 00:01:04 -05:00
Stephen Kelly ddc052052b Always use the auto_ptr from cmsys. 
This is for consistency throughout cmake. The cmsys version exists
becaues uses of auto_ptr types as return types does not work with
some implementations in ancient compilers.
 2012-11-21 00:56:36 +01:00
Stephen Kelly d8a59ea4b3 Port cmGeneratorExpression to cmTarget from cmGeneratorTarget. 
Following from the discussion here:

 http://thread.gmane.org/gmane.comp.programming.tools.cmake.devel/3615/focus=5170
 (Re: Generator expressisons in target properties, 26 Oct 12:10)

we can't split cmTarget API for linking into cmGeneratorTarget. In
the future we will probably also need to move the include and compile
definitions API back to cmTarget so that it can be used by export().
 2012-11-21 00:11:54 +01:00
Peter Kümmel 12ab1354fc Ninja: encode LINK_FLAGS to handle bash variables 
Bug 13560
 2012-11-20 22:00:09 +01:00
Brad King 8faf4e9380 Merge topic 'FixAutomocRegression3' 
d253657 Automoc: fix regression #13667, broken build in phonon
 2012-11-20 11:48:09 -05:00
Brad King d82200df26 Merge topic 'generator-factory' 
75ebebc VS: Remove platform specific generator files
8b62080 VS: Remove EnableLanguage from platform-specific generators
5bdf011 VS: Remove GetPlatformName from platform-specific generators
8d42ab4 VS: Fix ArchitectureId of Visual Studio 10 IA64 generator
6f439b3 VS: Remove AddPlatformDefinitions from platform-specific generators
5170a88 Make cmGlobalGenerator::GetDocumentation() a static function
04ff866 Allow a GeneratorFactory handling of more than one generator
984ebc3 Search generator in cmake::ExtraGenerators before in cmake::Generators
30a6950 Add cmGlobalGeneratorFactory::GetGenerators()
e8f8414 Introduce the abstract class cmGlobalGeneratorFactory
 2012-11-20 11:48:05 -05:00
Brad King 9e73b3a095 Merge topic 'fix-IMPORTED-GLOBAL-reconfigure' 
5ff7587 Initialize IMPORTED GLOBAL targets on reconfigure (#13702)
 2012-11-20 11:47:57 -05:00
Brad King 5e0906629b Merge topic 'AutomocInheritFOLDERTargetProperty' 
3efe1d3 Automoc: "inherit" FOLDER target property from target (#13688)
 2012-11-20 11:47:51 -05:00
Brad King 6d85dce6f8 Merge topic 'vs-drop-Zm' 
cd73979 MSVC: Drop default use of /Zm1000 for VS >= 7.1
 2012-11-20 11:47:47 -05:00
Brad King 53b7e71e88 Merge topic 'vs-global-sections' 
45d4f81 Merge topic 'per-config-EXCLUDE_FROM_DEFAULT_BUILD' into vs-global-sections
694322e Define properties VS_GLOBAL_SECTION_*
2c91962 Implement properties VS_GLOBAL_SECTION_*
57cadc1 Add tests for VS_SOLUTION_GLOBAL_SECTIONS
 2012-11-20 11:47:43 -05:00
Brad King 508504ab6f Merge topic 'per-config-EXCLUDE_FROM_DEFAULT_BUILD' 
739f166 Serialize tests for EXCLUDE_FROM_DEFAULT_BUILD
e31d83b Define property EXCLUDE_FROM_DEFAULT_BUILD
d1f8828 Add property EXCLUDE_FROM_DEFAULT_BUILD_<CONFIG>
b777272 Add tests for EXCLUDE_FROM_DEFAULT_BUILD
 2012-11-20 11:47:35 -05:00