12840 Commits

Author SHA1 Message Date
KWSys Robot
a92b17e421 KWSys Nightly Date Stamp 2011-10-03 00:09:33 -04:00
Peter Collingbourne
fec4b63714 Fix configuration-dependent flag lookup in cmLocalGenerator::GetTargetFlags
Specifically, perform configuration-dependent lookup of
STATIC_LIBRARY_FLAGS for static libraries, and use the correct prefix
for configuration-dependent lookup of LINK_FLAGS (i.e. "LINK_FLAGS_",
as opposed to the value of the LINK_FLAGS property).
2011-10-02 18:30:43 +01:00
Peter Collingbourne
557956f348 Introduce a cmGlobalGenerator::ResolveLanguageCompiler function
It is factored out of cmGlobalUnixMakefileGenerator3::EnableLanguage,
and may be used by other generators to resolve CMAKE_*_COMPILER
settings.
2011-10-02 18:30:43 +01:00
Peter Collingbourne
5b114c9bee Introduce a cmLocalGenerator::ConvertToIncludeReference function
This provides a mechanism for the local generator to override how
header search paths are generated.
2011-10-02 18:30:43 +01:00
Peter Collingbourne
903d914b28 Make cmLocalGenerator::ConvertToLinkReference virtual
This provides a mechanism for the local generator to override how
library search paths are generated.
2011-10-02 18:30:43 +01:00
Nicolas Despres
8a0eb78f3b Constify many getters of cmGlobalGenerator. 2011-10-02 18:30:42 +01:00
Nicolas Despres
4532d36cc9 Add const versions of some getters. 2011-10-02 18:30:42 +01:00
Nicolas Despres
3db2973bd2 Refactor TargetTypeNames.
Make it a static method instead of an array. It is safer for the
type checking and if we add a new target type we will be warned to add
a case to the switch.
2011-10-02 18:30:42 +01:00
KWSys Robot
18c0aa0db7 KWSys Nightly Date Stamp 2011-10-02 00:09:44 -04:00
Alex Neundorf
3df49dc7b1 fix #12392: handle CMAKE_CXX_COMPILER_ARG1 for Eclipse projects
CMAKE_CXX/C_COMPILER_ARG1 have to be used for finding the include
dirs and builtin macros, so Eclipse can do code completion

Alex
2011-10-01 19:09:24 +02:00
KWSys Robot
867b226898 KWSys Nightly Date Stamp 2011-10-01 00:09:52 -04:00
Bill Hoffman
8f1ee5181d Also, check for 11.x as an intel fortran version.
As Dave Cole pointed out the previous commit only checked for 10.x and 12.x.
11.0 was accounted for, but 11.1, 11.2 and 11.3 were not.  This patch
should make it work for those versions as well.  I did a web check and there
are 11.0, 11.1, 11.2 and 11.3 versions from Intel. I assume if 12.x uses
11.0 as the version in the .vfproj file, then all of the 11.x versions would
as well.
2011-09-30 17:11:34 -04:00
David Cole
c4e08b5533 Merge topic 'ImproveFindPackageModeWithTryCompile'
f15945e Use makefile->IssueMessage() for better error messages
c886e31 Improve behaviour of --find-package mode with try_run/try_compile
31f43fd Remove trailing whitespace
2011-09-30 15:57:20 -04:00
David Cole
449aef3efb Merge topic 'vs11-generator'
3b5256e Teach our tests about special cases for VS 11
3d5632e Add Visual Studio 11 generator for x86 and x64 tools
2011-09-30 15:57:17 -04:00
Bill Hoffman
0cd3606afd Use version 11.0 for 12.x and 9.10 for 10.x intel versions to fix 12.1 vsIDE.
The intel compiler for 12.0 and 12.1 are known to expect the file version
to be 11.0 in the .vfproj file.  For 10.x it should be 9.10.  Prior to
this fix 12.0 and 10.1 were the only values checked. If those did not match
the actual version of intel was put in the vfproj file causing an error
about future version load attempt in the IDE.
2011-09-30 15:52:37 -04:00
KWSys Robot
72bac428cc KWSys Nightly Date Stamp 2011-09-30 00:09:34 -04:00
KWSys Robot
8a3bca50fa KWSys Nightly Date Stamp 2011-09-29 00:07:38 -04:00
KWSys Robot
ef8cc9997c KWSys Nightly Date Stamp 2011-09-28 00:09:40 -04:00
Alex Neundorf
f15945edad Use makefile->IssueMessage() for better error messages
Alex
2011-09-27 18:59:42 +02:00
KWSys Robot
77593178cf KWSys Nightly Date Stamp 2011-09-27 00:09:39 -04:00
Brad King
26f079044d Merge topic 'doc-set_target_properties-typo'
f8c77fa Fix typo in set_target_properties' documentation.
2011-09-26 11:24:39 -04:00
KWSys Robot
0bf12af36c KWSys Nightly Date Stamp 2011-09-26 00:09:04 -04:00
KWSys Robot
9584135674 KWSys Nightly Date Stamp 2011-09-25 00:09:58 -04:00
KWSys Robot
e4bd3b0cf3 KWSys Nightly Date Stamp 2011-09-24 00:09:49 -04:00
Brad King
b0cd630521 Refactor find_* command final path list computation
All find_* commands re-root the list of paths and then add trailing
slashes.  Factor this pair of calls out into a dedicated method.  The
new method would be the only caller to AddTrailingSlashes, so subsume
that method into it.
2011-09-23 14:36:27 -04:00
Brad King
3d5632ed59 Add Visual Studio 11 generator for x86 and x64 tools 2011-09-23 10:10:01 -04:00
Raphael Kubo da Costa
f8c77fa97b Fix typo in set_target_properties' documentation.
our -> or
2011-09-23 08:16:08 -04:00
KWSys Robot
8c280435df KWSys Nightly Date Stamp 2011-09-23 00:09:39 -04:00
KWSys Robot
4a1aadbb00 KWSys Nightly Date Stamp 2011-09-22 00:09:30 -04:00
David Cole
682a989fdb Merge topic 'CPackDeb-fakeroot'
49da3bd CPackDeb fix #10325 automagically use fakeroot for DEB if fakeroot is found
2011-09-21 17:29:16 -04:00
KWSys Robot
41c6b3dd4d KWSys Nightly Date Stamp 2011-09-21 00:09:39 -04:00
David Cole
47dac7ec97 Merge topic 'file-download-http-error'
09817e9 Make file(DOWNLOAD) fail on http error
2011-09-20 14:42:26 -04:00
KWSys Robot
400c74f325 KWSys Nightly Date Stamp 2011-09-20 00:14:11 -04:00
Brad King
09817e91f9 Make file(DOWNLOAD) fail on http error
If a http server responds with a result code greater than 400 then the
data returned from the download probably do not match that expected.
Teach file(DOWNLOAD) to fail with an error in this case instead of
silently pretending that the download worked.  The file(UPLOAD) command
already does this.
2011-09-19 17:41:48 -04:00
KWSys Robot
cfc6e01851 KWSys Nightly Date Stamp 2011-09-19 00:14:09 -04:00
KWSys Robot
f1cd7d289e KWSys Nightly Date Stamp 2011-09-18 00:13:12 -04:00
KWSys Robot
962a54db5f KWSys Nightly Date Stamp 2011-09-17 00:14:04 -04:00
KWSys Robot
7fca32a0bb KWSys Nightly Date Stamp 2011-09-16 00:14:06 -04:00
Alex Neundorf
c886e312bb Improve behaviour of --find-package mode with try_run/try_compile
Instead of failing with an error message which says things have not been
setup correctly, it now says that try_compile/try_run() are not
supported in find_package mode (#12426).

Alex
2011-09-15 16:28:35 +02:00
Alex Neundorf
31f43fdb5a Remove trailing whitespace
Alex
2011-09-15 16:20:33 +02:00
KWSys Robot
ec0f23515f KWSys Nightly Date Stamp 2011-09-15 00:14:07 -04:00
KWSys Robot
2a3441b65f KWSys Nightly Date Stamp 2011-09-14 00:14:04 -04:00
David Cole
98d5623a7b Merge topic 'effective-platform-name'
64c9b31 Xcode: Add test to demonstrate iOS project in Xcode
59a2265 Xcode: Use EFFECTIVE_PLATFORM_NAME reference in ComputeOutputDir
2011-09-13 14:33:21 -04:00
KWSys Robot
c7021203de KWSys Nightly Date Stamp 2011-09-13 00:13:05 -04:00
David Cole
59a2265576 Xcode: Use EFFECTIVE_PLATFORM_NAME reference in ComputeOutputDir
Caveats apply: only valid when not overriding default value for output
dir *and* there is a CMAKE_XCODE_EFFECTIVE_PLATFORMS value.

For now, CMAKE_XCODE_EFFECTIVE_PLATFORMS must be defined in each
project, or in the cache for a build.

Code relying on value of LOCATION and similar properties may not
work if it depends on file existence on disk since CMake will not
evaluate $(EFFECTIVE_PLATFORM_NAME). This feature is only enabled
for making it easier to build Xcode iOS projects where the developer
wants to be able to switch easily between simulator and device builds.
2011-09-12 15:21:00 -04:00
KWSys Robot
201173133c KWSys Nightly Date Stamp 2011-09-12 00:10:18 -04:00
KWSys Robot
39d5c49f21 KWSys Nightly Date Stamp 2011-09-11 00:14:12 -04:00
KWSys Robot
e27a0e9870 KWSys Nightly Date Stamp 2011-09-10 00:14:05 -04:00
KWSys Robot
3ae6060f29 KWSys Nightly Date Stamp 2011-09-09 00:14:04 -04:00
KWSys Robot
3246dc2665 KWSys Nightly Date Stamp 2011-09-08 00:14:08 -04:00