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
Patrick Gansterer
3a1006e41f
VS: Added "Deploy" at project configuration for WindowsCE targets
2012-11-27 08:31:20 -05:00
Patrick Gansterer
40c36c9f7b
VS: Make DetermineCompilerId working with WinCE too
...
Add a dummy mainCRTStartup() function, since the linker searches for
it instead of main() and set the CMAKE_SYSTEM_* variables depending
on the MSVC_C_ARCHITECTURE_ID and CMAKE_VS_WINCE_VERSION variables.
2012-11-27 08:31:19 -05:00
Patrick Gansterer
038df9e49e
VS: Allow setting the name of the target platform
...
Since the name for a target platform is independent of its cpu
architecture an additional option is required to set it correctly.
2012-11-27 08:31:18 -05:00
Patrick Gansterer
6fe4fcba78
VS: Add parser for WCE.VCPlatform.config to read WinCE platforms
...
Parse the WCE.VCPlatform.config file, which contains the installed
WindowsCE SDKs in XML format, and add possibility to generate
Visual Studio generators for them.
2012-11-27 08:31:17 -05:00
Kitware Robot
075e0daabc
CMake Nightly Date Stamp
2012-11-27 00:01:05 -05:00
Brad King
da1d9bac63
Test find_path multiarch support ( #13742 )
2012-11-26 17:06:12 -05:00
Stephen Kelly
ee96dc7686
Genex: Extract a method to parse parameters.
2012-11-26 22:52:22 +01:00
Brad King
b96f6fc2aa
Teach find_(path|file) about Linux multiarch ( #13742 )
...
Implement support for multiarch include directories as specified here:
https://wiki.ubuntu.com/MultiarchCross
Generalize the multiarch feature added in commit b41ad3b3
(Teach
find_(library|package) about Linux multiarch, 2011-06-08) to the
find_path and find_file commands. Teach them to search
<prefix>/include/<arch> whenever they would search <prefix>/include.
2012-11-26 16:46:04 -05: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
Patrick Gansterer
2118a2016f
VS: Support setting correct subsystem and entry point for WinCE
...
WinCE has only one SubSystem. So the WIN32_EXECUTABLE property
must be handled via the EntryPointSymbol in the vcproj files.
2012-11-26 09:33:28 -05:00
Patrick Gansterer
6920fed652
VS: Change variable type of Name from const char* to string
2012-11-26 09:33:27 -05:00
Patrick Gansterer
102521b6b3
VS: Change variable type of ArchitectureId from const char* to string
2012-11-26 09:33:26 -05:00
Patrick Gansterer
332dc09d0d
VS: Add static method to get the base of the registry
2012-11-26 09:33:25 -05:00
Patrick Gansterer
d41d4d3d61
VS: Add CMAKE_VS_PLATFORM_NAME definition to cmMakefile
...
When adding more platforms to the Visual Studio generators a simple
regular expressing can not handle all cases anymore. This new
define holds the name of the Visual Studio target platform.
2012-11-26 09:33:24 -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
Morné Chamberlain
b3ae61f833
Merge branch 'master' into sublime-text-2-generator
2012-11-24 20:23:55 +02:00
Morné Chamberlain
089d9ccdce
SublimeText 2 Gen: Set the sublimeclang_options_script property.
...
The sublimeclang_options_script property is now set in the project
file. It is set to execute a python script that reads the JSON options
file to get options per source file. Python must be installed and in the
path for this feature to work from Sublime Text.
2012-11-24 20:19:35 +02: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