17301 Commits

Author SHA1 Message Date
David Cole
02e99d9851 Merge topic 'FindRubyOnOpenBSD'
d2b1ce6 Find Ruby on OpenBSD when installed from ports (#12507)
ba5a8bc Remove trailing whitespace
2011-10-18 15:02:53 -04:00
David Cole
fe09546f8b Merge topic 'SilentMakeOutputOnBSD'
0d44ce2 Silence make on OpenBSD in FindPackageModeTest(#12508)
2011-10-18 15:02:47 -04:00
David Cole
56b153d3e5 Merge topic 'vs10-nologo-issue-12504'
25116a3 Fix CMAKE_VERBOSE_MAKEFILE for VS10 vcxproj files (#12504)
2011-10-18 15:02:38 -04:00
David Cole
91e970ce5b Merge topic 'DetectMasmCompilerId'
cf93d63 fix #12465: detect the masm compiler ID ("MSVC")
2011-10-18 15:02:30 -04:00
KWSys Robot
fa7a747b33 KWSys Nightly Date Stamp 2011-10-18 00:10:11 -04:00
KWSys Robot
c6e7487499 KWSys Nightly Date Stamp 2011-10-17 00:09:44 -04:00
KWSys Robot
80621968ea KWSys Nightly Date Stamp 2011-10-16 00:10:00 -04:00
KWSys Robot
eb11e0b9ac KWSys Nightly Date Stamp 2011-10-15 00:10:02 -04:00
KWSys Robot
6eb2d79d72 KWSys Nightly Date Stamp 2011-10-14 00:10:10 -04:00
KWSys Robot
731d61d8d9 KWSys Nightly Date Stamp 2011-10-13 00:10:00 -04:00
Alex Neundorf
d2b1ce6af0 Find Ruby on OpenBSD when installed from ports (#12507)
The ruby library on OpenBSD is named rubyXY, not ruby X.y.
Find that too.

Alex
2011-10-12 23:05:52 +02:00
Alex Neundorf
ba5a8bcf5d Remove trailing whitespace
Alex
2011-10-12 23:05:30 +02:00
Alex Neundorf
0d44ce2bf4 Silence make on OpenBSD in FindPackageModeTest(#12508)
BSD make doesn't use -v for printing its name and version, and so
complains on stderr that this is a bad command line option, used
in Tests/FindPackageModeMakefileTest/CMakeLists.txt .
Silence stderr to make that ugly output go away.
Patch by David Coppy.

Alex
2011-10-12 22:20:18 +02:00
KWSys Robot
83e4a45609 KWSys Nightly Date Stamp 2011-10-12 00:09:42 -04:00
Niels Dekker
25116a3cc2 Fix CMAKE_VERBOSE_MAKEFILE for VS10 vcxproj files (#12504) 2011-10-11 17:07:53 -04:00
David Cole
1226404545 Merge topic 'ninja-generator-prep'
32f8437 Fix line-too-long style violations
029ab31 Constify XCode generator getters to match cmGlobalGenerator
fec4b63 Fix configuration-dependent flag lookup in cmLocalGenerator::GetTargetFlags
557956f Introduce a cmGlobalGenerator::ResolveLanguageCompiler function
5b114c9 Introduce a cmLocalGenerator::ConvertToIncludeReference function
903d914 Make cmLocalGenerator::ConvertToLinkReference virtual
8a0eb78 Constify many getters of cmGlobalGenerator.
4532d36 Add const versions of some getters.
3db2973 Refactor TargetTypeNames.
2011-10-11 14:45:35 -04:00
David Cole
d9f996334b Merge topic 'export-header-tests'
08271ec Build each library only once instead of once for each test.
c83cfd7 Remove unused define.
2011-10-11 14:45:31 -04:00
David Cole
c8e92de286 Merge topic 'DependencyScanningForASM'
e36a1be fix #12262: use the C dependency scanner also for ASM files
2011-10-11 14:45:27 -04:00
David Cole
296fde32dd Merge topic 'CodeBlocks-quoting'
240d39a Fix XML safety issue with adding preprocessor defines in CodeBlocks project.
2011-10-11 14:45:17 -04:00
David Cole
6a8c70365f Merge topic 'libarchive-CheckFileOffsetBits-typo'
41719b7 libarchive: fix typo in CheckFileOffsetBits.cmake
2011-10-11 14:45:13 -04:00
David Cole
3ece15b8f9 Merge topic 'HandleCMAKE_CXX_COMPILER_ARG1InEclipse'
3df49dc fix #12392: handle CMAKE_CXX_COMPILER_ARG1 for Eclipse projects
2011-10-11 14:45:09 -04:00
David Cole
4daef775f5 Merge topic 'refactor-find-search-paths'
b0cd630 Refactor find_* command final path list computation
2011-10-11 14:45:00 -04:00
David Cole
bb28c9f3bf Merge topic 'qt_dbus_interface_args'
648c454 Add features from KDE for arguments to qdbusxml2cpp.
2011-10-11 14:44:48 -04:00
KWSys Robot
fac6e2ef44 KWSys Nightly Date Stamp 2011-10-11 00:09:47 -04:00
Brad King
32f8437bbf Fix line-too-long style violations
Commit 8a0eb78f (Constify many getters of cmGlobalGenerator, 2011-03-26)
added const qualifiers to many cmGlobalGenerator methods but left the
resulting lines beyond our style's limit of 79 characters.
2011-10-10 09:46:27 -04:00
KWSys Robot
d1f5a3bff9 KWSys Nightly Date Stamp 2011-10-10 00:09:36 -04:00
Stephen Kelly
08271ec7d3 Build each library only once instead of once for each test. 2011-10-09 17:41:47 +02:00
Stephen Kelly
c83cfd7a01 Remove unused define. 2011-10-09 17:39:24 +02:00
KWSys Robot
d17ab57c53 KWSys Nightly Date Stamp 2011-10-09 00:09:32 -04:00
KWSys Robot
48171cefb5 KWSys Nightly Date Stamp 2011-10-08 00:10:17 -04:00
Brad King
029ab3102e Constify XCode generator getters to match cmGlobalGenerator
Commit 8a0eb78f (Constify many getters of cmGlobalGenerator, 2011-03-26)
added const qualifiers to many cmGlobalGenerator methods.  Fix the
signature of the virtual function overrides in cmGlobalXCodeGenerator to
match.
2011-10-07 08:22:05 -04:00
KWSys Robot
783da62f2e KWSys Nightly Date Stamp 2011-10-07 00:09:53 -04:00
Alex Neundorf
cf93d63c0a fix #12465: detect the masm compiler ID ("MSVC")
Alex
2011-10-06 17:57:32 +02:00
KWSys Robot
61c69d3fbb KWSys Nightly Date Stamp 2011-10-06 00:05:17 -04:00
Alex Neundorf
e36a1be466 fix #12262: use the C dependency scanner also for ASM files
Files for the ASM language are those assembler files which are processed
by the C/CXX compiler, and they may contain preprocessor directives, so
run the C dependency scanner also on them.

Alex
2011-10-05 21:51:35 +02:00
Clinton Stimpson
240d39a6a4 Fix XML safety issue with adding preprocessor defines in CodeBlocks project. 2011-10-05 10:02:32 -06:00
Rolf Eike Beer
41719b7507 libarchive: fix typo in CheckFileOffsetBits.cmake
s/Cheking/Checking/
2011-10-05 09:29:36 -04:00
KWSys Robot
ab97790c33 KWSys Nightly Date Stamp 2011-10-05 00:07:09 -04:00
David Cole
3105dc3de6 Begin post-2.8.6 development 2011-10-04 14:41:15 -04:00
David Cole
5971063a5c CMake 2.8.6 2011-10-04 11:48:52 -04:00
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
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