Commit Graph

17413 Commits

Author SHA1 Message Date
David Cole fd9890077c Merge branch 'release' 2011-10-04 11:47:53 -04:00
KWSys Robot 80a0e2c344 KWSys Nightly Date Stamp 2011-10-04 00:09:40 -04:00
Mike McQuaid 06180459cc Add DeployQt4 module.
Add a module that gives better support to BundleUtilities to handle
Qt plugins and deploy Qt applications.
2011-10-03 11:01:48 -06:00
Mike McQuaid cf4b52980d Add QT_LIBRARIES_PLUGINS variable to UseQt4. 2011-10-03 11:01:39 -06:00
David Cole 68e43c2fad Merge topic 'fix_intel_vs_version'
8f1ee51 Also, check for 11.x as an intel fortran version.
0cd3606 Use version 11.0 for 12.x and 9.10 for 10.x intel versions to fix 12.1 vsIDE.
2011-10-03 11:54:15 -04:00
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 e3d593ad4d Merge topic 'really-eliminate-clang-warnings'
ad6fa0c CTestCustom.cmake: Ignore clang's summary warning
2011-09-30 15:57:28 -04:00
David Cole c4ef30e3dd Merge topic 'PkgConfigTypoFix'
9cbbea3 Fix typo in UsePkgConfig.cmake
2011-09-30 15:57:24 -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
David Cole ad6fa0cbca CTestCustom.cmake: Ignore clang's summary warning
Assuming prior text has matched some other warning expression...
2011-09-29 15:44:03 -04:00
Rolf Eike Beer 9cbbea31d3 Fix typo in UsePkgConfig.cmake 2011-09-29 19:43:44 +02: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 89bdc3e213 Merge topic 'FindBulletLibRenames'
6f935d7 FindBullet: Also search for _Debug postfixed library names
2011-09-26 11:24:46 -04:00
Brad King ea1901b6a4 Merge topic 'MinorPkgConfigDocImprovement'
59ccf38 Minor improvements to the UsePkgConfig.cmake docs
ad11118 Remove trailing whitespace
2011-09-26 11:24:43 -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 3b5256e19e Teach our tests about special cases for VS 11
Teach the CheckCompilerRelatedVariables test to verify MSVC11.  Update
the special cases already in the Preprocess and VSExternalInclude tests
for VS 10 to work for VS 11 too.
2011-09-23 11:07:24 -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
Philip Lowman 6f935d7f55 FindBullet: Also search for _Debug postfixed library names 2011-09-22 23:31:37 -04:00
David Cole c16e387412 CMake 2.8.6-rc4 2011-09-22 14:08:22 -04:00
David Cole afff1ab901 Merge branch 'release' 2011-09-22 14:06:40 -04:00
Alex Neundorf 59ccf38554 Minor improvements to the UsePkgConfig.cmake docs
Alex
2011-09-22 14:47:18 +02:00
Alex Neundorf ad11118ebf Remove trailing whitespace
Alex
2011-09-22 14:39:19 +02:00
KWSys Robot 4a1aadbb00 KWSys Nightly Date Stamp 2011-09-22 00:09:30 -04:00
David Cole 26e5b0ea82 Merge topic 'revert-fix-for-11333'
98c49a4 Revert "FindThreads: Try pthreads with no special option first (#11333)"
2011-09-21 17:29:39 -04:00
David Cole ac623ce2fe Merge topic 'CPackRPM-per-component-script'
cc26a06 CPackRPM authorize per-component pre/post-[un]install scripts (#0012063)
2011-09-21 17:29:30 -04:00
David Cole 253e370c9e Merge topic 'generate-export-header'
41e2b1d Make add_compiler_export_flags a function again.
6a10deb Made ADD_COMPILER_EXPORT_FLAGS into a macro.
2d1acfe Don't warn when nothing to do in visibility function.
d679568 Just code style changes.
2011-09-21 17:29:23 -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