Commit Graph

15611 Commits

Author SHA1 Message Date
Brad King bc7395c096 Merge branch 'vs-target-dependencies' into imported-target-dependencies 2010-11-19 13:23:17 -05:00
KWSys Robot acf60463de KWSys Nightly Date Stamp 2010-11-19 00:10:26 -05:00
Philip Lowman 0263d8dffe 11384: FindCxxTest now includes test code in VS project
The test code header files are now included in the test target so they
will show up under "Header Files" in Visual Studio targets, for example.
2010-11-18 23:31:14 -05:00
Philip Lowman a44a05cd9d 11430: FindBullet doesn't find header files installed by Bullet >= 2.77 2010-11-18 22:24:21 -05:00
Brad King fd614e60b5 Use modern global dependency graph for VS < 8 deps
VS 7.1 and below have 2 behaviors that make the cmComputeTargetDepends
result difficult to use for solution-level dependencies.  Update the
method cmGlobalVisualStudioGenerator::ComputeTargetDepends to document
the behaviors and work around them.  Commit 1a0c166a (Store direct
dependencies in solutions for VS >= 8, 2010-08-20) isolated VS >= 8 from
this computation so those versions should be unaffected.

This change removes the last use of cmTarget::GetLinkLibraries for
purposes other than backward compatibility with legacy interfaces
(export_library_dependencies, VS 6 custom .dsp templates).  Now the
cmComputeTargetDepends results are used for all generators so global
target dependency computation is fully centralized.
2010-11-18 10:51:34 -05:00
Brad King 605f4bc097 Record edge type in global dependency graph
Each inter-target dependency may be a 'link' or 'util' dependency.
2010-11-18 10:51:00 -05:00
Brad King 5fe3ac86ee Prefer non-empty prefixes when matching lib names (#11468)
In cmComputeLinkInformation we match library names with a regular
expression, possibly extracting the 'lib' prefix.  The regex component
to match the prefix always allows an empty prefix to be matched, as in
"(lib|)".  Avoid every adding an empty prefix option earlier in the
regex, as in "(|lib|)", because it will be preferred and 'lib' will
never match.
2010-11-18 07:54:56 -05:00
KWSys Robot da0a463f17 KWSys Nightly Date Stamp 2010-11-18 00:10:08 -05:00
Alex Neundorf e3dfbf62fc Include CMakeDetermineCompilerId in CMakeDetermineASMCompiler.cmake (#11467)
CMakeDetermineASMCompiler.cmake relied on that somebody else (usually
during enabling C or CXX) already included that file, and broke if that
was not the case.
Thanks to Louis for the patch

Alex
2010-11-17 23:01:36 +01:00
Andrius Štikonas 8f1798c14a Modules: Fix spelling 'becase' -> 'because'. 2010-11-17 11:12:48 -05:00
KWSys Robot b541b1213a KWSys Nightly Date Stamp 2010-11-17 00:10:02 -05:00
David Cole 164b11deb7 Merge topic 'EP-extra-generator'
74e49aa BUG 11451 - pass CMAKE_EXTRA_GENERATOR down.
2010-11-16 14:46:46 -05:00
David Cole cb727a20df Merge topic 'find-doc-init'
5303fbf Speedup find_* commands (#11412)
2010-11-16 14:46:38 -05:00
David Cole c172ffef06 Merge topic 'cray-compiler'
53e76c8 Teach CMake about Cray C, C++, and Fortran compilers
34e1ac2 Create Fortran info variables for .mod behavior
2010-11-16 14:46:30 -05:00
David Cole e19fa08ac9 Merge topic 'MakeCodeBlocksGeneratorNonVerbose2'
156ae39 Don't disable colors in the CodeBlocks generator and minor cleanup.
e547fa7 Remove the "early alpha stage" comments about Eclipse and C::B
a02987a Don't enforce VERBOSE makefiles for the CodeBlocks generator
7b1421b Remove trailing whitespace
2010-11-16 14:46:25 -05:00
David Cole 8593a9d010 Merge topic 'fix-FOLDER-plus-include_external_msproject'
b3cf739 Honor FOLDER on include_external_msproject targets (#11436)
2010-11-16 14:46:20 -05:00
David Cole b61c5be3d7 Merge topic 'vs-intel-RuntimeLibrary'
22aec40 Set Intel .vfproj RuntimeLibrary attribute
3d79e7d Fix Intel .vfproj SubSystem attribute values
2010-11-16 14:46:12 -05:00
David Cole caf680c4d7 Merge topic 'FixFindQt3REQUIRED'
a39ee97 Fix #11421: FindQt3.cmake doesn't honor the REQUIRED keyword
2010-11-16 14:46:04 -05:00
David Cole f4f3c9ff49 Merge topic 'suppress-dashboard-warnings'
1e26f7c Suppress "loop was vectorized" "warnings."
2010-11-16 14:45:58 -05:00
David Cole e7674ae1f0 Merge topic 'vs8-direct-depends'
1a0c166 Store direct dependencies in solutions for VS >= 8
2010-11-16 14:45:53 -05:00
KWSys Robot 836c266731 KWSys Nightly Date Stamp 2010-11-16 00:10:03 -05:00
Eric NOULARD 66e86b4770 CPack fix kwstyle breakage and make CPackRPM backward compatible
backward compatible= No componentized RPM unless requested
using CPACK_RPM_COMP0NENT_INSTALL
2010-11-15 20:54:19 +01:00
KWSys Robot 40b9336b31 KWSys Nightly Date Stamp 2010-11-15 00:10:03 -05:00
Alex Neundorf 78c86f4542 Exclude targets from the graphviz file based on a regex
This commit adds support for a GRAPHVIZ_TARGET_IGNORE_REGEX variable
which can be set() in CMakeGraphVizOptions.cmake.
Targets matching this regex will be skipped when generating the graphviz
graphs.

Alex
2010-11-14 19:47:28 +01:00
Alex Neundorf 5ea1e4cb36 Collect targets and libs on demand instead of in the ctor
This is necessary for the next commit which requires that
the targets are collected after the settings have been read.

Alex
2010-11-14 19:37:03 +01:00
Alex Neundorf 2a5790a080 Use std::cout instead of fprintf
Alex
2010-11-14 19:33:12 +01:00
Alex Neundorf 7ba2d36585 Enable/disable generating graphs depending on the target type
In CMakeGraphVizOptions.cmake you can now set GRAPHVIZ_EXECUTABLES,
GRAPHVIZ_STATIC_LIBS, GRAPHVIZ_SHARED_LIBS and GRAPHVIZ_MODULE_LIBS
to TRUE or FALSE depending on whether you want graphs for the
targets of the respective types.

Alex
2010-11-14 19:30:58 +01:00
KWSys Robot dabcb7b8e4 KWSys Nightly Date Stamp 2010-11-14 00:10:03 -05:00
Eric NOULARD 2c84d169b3 CPackRPM add basic component support to CPackRPM
basic means 1 RPM per component and no dependency handling
this implies some CPackGenerator refactoring
2010-11-13 17:56:36 +01:00
KWSys Robot 33f650a5c9 KWSys Nightly Date Stamp 2010-11-13 00:10:02 -05:00
Marcus D. Hanwell 74e49aa441 BUG 11451 - pass CMAKE_EXTRA_GENERATOR down.
This patch fixes the behavior of external projects with respect to
generators using the CMAKE_EXTRA_GENERATOR variable.
2010-11-12 19:43:05 -05:00
Alex Neundorf e0b60166d4 Some more fixes for nasm support, from Etienne (#10069)
Alex
2010-11-12 20:27:18 +01:00
Brad King 82596fcffc Merge branch 'vs8-direct-depends' into vs-target-dependencies 2010-11-12 12:42:50 -05:00
Brad King 5303fbf09e Speedup find_* commands (#11412)
Delay computation of the command documentation until it is needed.
It is wasteful to do it in the constructor on every call.

Inspired-By: Christian Ehrlicher <Ch.Ehrlicher@gmx.de>
2010-11-12 10:47:28 -05:00
Brad King 53e76c8f12 Teach CMake about Cray C, C++, and Fortran compilers
The Cray Fortran compiler needs "-em" to enable module output and also
"-J." to place the .mod files in the current working directory (instead
of next to the .o file).
2010-11-12 09:12:08 -05:00
Brad King 34e1ac2489 Create Fortran info variables for .mod behavior
Define CMAKE_Fortran_MODDIR_DEFAULT and CMAKE_Fortran_MODOUT_FLAG
variables to help some Fortran compilers generate .mod files in the
current working directory.
2010-11-12 09:03:49 -05:00
KWSys Robot e6975fe82f KWSys Nightly Date Stamp 2010-11-12 00:10:04 -05:00
Alex Neundorf 156ae39905 Don't disable colors in the CodeBlocks generator and minor cleanup.
Since now the only users of SetToolSupportsColor() are gone, this
method is removed too.

Alex
2010-11-11 22:13:39 +01:00
Alex Neundorf e547fa763b Remove the "early alpha stage" comments about Eclipse and C::B
Alex
2010-11-11 22:07:24 +01:00
Alex Neundorf a02987a0df Don't enforce VERBOSE makefiles for the CodeBlocks generator
Instead of enforcing verbose makefile, now the generated build command
includes "VERBOSE=1" so the output will be verbose when building in
C::B.
Also removed the now unused setForceVerboseMakefiles().

Alex
2010-11-11 22:06:09 +01:00
Alex Neundorf 7b1421b885 Remove trailing whitespace
Alex
2010-11-11 22:02:07 +01:00
David Cole 3c245ab2ba Merge topic '11429_FindGTK2_MSVC10'
1321eb9 11429: FindGTK2 does not find libraries built for Visual Studio 2010
2010-11-11 08:38:35 -05:00
KWSys Robot f4aa65cdf5 KWSys Nightly Date Stamp 2010-11-11 00:10:02 -05:00
David Cole b3cf739e2c Honor FOLDER on include_external_msproject targets (#11436)
Add FOLDER property usage to the VSExternalInclude test
and inspect results manually to verify behavior.

Thanks to Jens Auer for the bug report.
2010-11-10 09:06:09 -05:00
KWSys Robot c5762cf58c KWSys Nightly Date Stamp 2010-11-10 00:10:02 -05:00
Philip Lowman 1321eb9796 11429: FindGTK2 does not find libraries built for Visual Studio 2010
Adds support for detecting builds of FindGTK2 with Visual Studio 2010.
Thanks to Vincent Levesque for the patch.
2010-11-09 21:43:08 -05:00
Brad King 22aec406e6 Set Intel .vfproj RuntimeLibrary attribute
Look for the "/threads", "/libs:dll", and "/dbglibs" flags and convert
them to the proper RuntimeLibrary attribute value in the IDE.  This is
a 3-to-1 flag mapping and such needs special handling in the parser.
2010-11-09 17:54:40 -05:00
Brad King 3d79e7d58c Fix Intel .vfproj SubSystem attribute values
The SubSystem attribute value must be "subSystemConsole" or
"subSystemWindows", not "1" or "2".  Commit 20f49730 (Reset
platform/compiler info status for each language, 2010-09-28) exposed
this bug by (correctly) passing the /libs:dll flag to the compiler,
which chokes the linker if a value for "/subsystem:" is not given.
2010-11-09 17:48:18 -05:00
David Cole 745671441d Merge topic 'fix_osf_build'
92c082b Add a fix for the inline keyword on the osf os.
bd56626 Fixes for the OSF operating system build.
2010-11-09 15:53:55 -05:00
Alex Neundorf a39ee97c6c Fix #11421: FindQt3.cmake doesn't honor the REQUIRED keyword
Alex
2010-11-09 21:51:59 +01:00