Commit Graph

11017 Commits

Author SHA1 Message Date
KWSys Robot 365beb2b16 KWSys Nightly Date Stamp 2010-11-21 00:10:03 -05:00
KWSys Robot 9054e598ef KWSys Nightly Date Stamp 2010-11-20 00:10:19 -05:00
Brad King e01cce2869 Allow add_dependencies() on imported targets (#10395)
Imported targets do not themselves build, but we can follow dependencies
through them to find real targets.  This allows imported targets to
depend on custom targets that provide the underlying files at build
time.
2010-11-19 17:19:21 -05:00
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
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
KWSys Robot b541b1213a KWSys Nightly Date Stamp 2010-11-17 00:10:02 -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 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
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 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
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
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 c8f6c33ec8 Merge topic 'external-link-depends'
95f149e Define LINK_DEPENDS target property (#11406)
07cfa57 Consolidate duplicate link rule make dependency code
2010-11-09 15:40:37 -05:00
David Cole e3b1dc171d Merge topic 'document-custom-command-no-DEPENDS'
80edcc6 Document custom command behavior without DEPENDS (#11407)
2010-11-09 15:39:43 -05:00
Alex Neundorf 84ce612c65 Move the code for generating dot-files into separate class cmGraphVizWriter
Alex
2010-11-09 21:37:51 +01:00
David Cole 8eaf172279 Merge topic 'rule-messages'
dc36b34 Honor RULE_MESSAGES property for build target messages
2010-11-09 15:36:08 -05:00
David Cole 1774622487 Merge topic 'cmake-gui-args-11388'
0476715 Fix regression to allow specifying a CMakeCache.txt file on the command line.
2010-11-09 15:32:43 -05:00
David Cole 5aa72c6374 Merge topic 'qtdialog-use-bundleutilities'
249a9bb cmake-gui: use BundleUtilities in place of custom script.
2010-11-09 15:26:51 -05:00
Brad King d8e0bfa786 KWSys: Teach SystemInformation about WinXP Pro and Win7
Modify a few lines in the function QueryOSInformation.

Change-Id: Ief8327144fdf5588354d4ce8240eb0206722e77e
Author: Marius Staring <m.staring@lumc.nl>
2010-11-09 10:50:03 -05:00
KWSys Robot bbb3d81d38 KWSys Nightly Date Stamp 2010-11-09 00:10:02 -05:00
KWSys Robot da778eeb4b KWSys Nightly Date Stamp 2010-11-08 00:10:02 -05:00
KWSys Robot d95017deec KWSys Nightly Date Stamp 2010-11-07 00:10:16 -04:00
KWSys Robot c5a47ad148 KWSys Nightly Date Stamp 2010-11-06 00:10:10 -04:00
Brad King 95f149e61f Define LINK_DEPENDS target property (#11406)
Custom Makefile link rules may need to depend on linker scripts.  Define
this property to allow user-specified link-time dependencies.
2010-11-05 09:05:08 -04:00
Brad King 07cfa57ec5 Consolidate duplicate link rule make dependency code
Factor code previously duplicated for library and executable rules into
a common method.
2010-11-05 08:33:47 -04:00
Brad King 80edcc6a86 Document custom command behavior without DEPENDS (#11407)
The behavior of add_custom_command when no DEPENDS option is specified
matches that of standard Make behavior, but it does not hurt to describe
it explicitly.
2010-11-05 08:08:37 -04:00
KWSys Robot 947de96030 KWSys Nightly Date Stamp 2010-11-05 00:10:09 -04:00
KWSys Robot b58e44edfb KWSys Nightly Date Stamp 2010-11-04 00:10:01 -04:00
Campbell Barton dc36b34994 Honor RULE_MESSAGES property for build target messages 2010-11-03 10:10:03 -04:00
KWSys Robot 5cf99388c3 KWSys Nightly Date Stamp 2010-11-03 00:11:01 -04:00
KWSys Robot aa350314db KWSys Nightly Date Stamp 2010-11-02 00:11:02 -04:00
Clinton Stimpson 0476715b87 Fix regression to allow specifying a CMakeCache.txt file on the command line. 2010-11-01 09:40:25 -06:00
KWSys Robot c1a064ba79 KWSys Nightly Date Stamp 2010-11-01 00:11:13 -04:00
Alex Neundorf a60b09927d Generate separate dot files for each target, and a big one with everything.
The big all-in-one file is basically unusable for e.g. kdelibs, it contains
around 1000 nodes and the created image is huuuuge !
Too big actually to be displayable or viewable or comprehensable.

Alex
2010-10-31 17:40:46 +01:00
Alex Neundorf 487bd571d5 Properly insert all targets, also those which don't link to anything.
Alex
2010-10-31 16:23:40 +01:00
Alex Neundorf de2b2bf9ef Move the code for collecting targets and libraries into separate functions
Found bug: targets which don't link to anything don't get inserted in
the dot file.

Alex
2010-10-31 15:58:18 +01:00
Alex Neundorf f7d56df39e Remove trailing whitespace and minor formatting changes for the dot-code
Alex
2010-10-31 14:46:09 +01:00
KWSys Robot e3c46e648b KWSys Nightly Date Stamp 2010-10-31 00:11:07 -04:00
KWSys Robot 2d3952d521 KWSys Nightly Date Stamp 2010-10-30 00:11:07 -04:00
KWSys Robot 57eea54720 KWSys Nightly Date Stamp 2010-10-29 00:11:07 -04:00
David Cole 9bf662a92a Merge topic 'fix_ctest_working_dir'
3f94c7c When processing DartMeasurements use the tests working directory.
2010-10-28 15:36:17 -04:00
David Cole 3f3f3e5f54 Merge topic 'CPackDeb-MoreControl'
a749724 CPackDeb Added several optional debian binary package fields
2010-10-28 14:10:23 -04:00
KWSys Robot 70101ee8e7 KWSys Nightly Date Stamp 2010-10-28 00:11:05 -04:00
KWSys Robot 01a90e9622 KWSys Nightly Date Stamp 2010-10-27 00:11:06 -04:00
KWSys Robot 7db02e9b3a KWSys Nightly Date Stamp 2010-10-26 00:11:04 -04:00
Eric NOULARD a749724029 CPackDeb Added several optional debian binary package fields
This fixes bugs #0011355  and 0008342.
The merged patch is a contribution from Michael Lasmanis and Petri Hodju
with some extra documentation added by the merger.
2010-10-25 20:40:45 +02:00
KWSys Robot 06b5eaa3cf KWSys Nightly Date Stamp 2010-10-25 00:11:05 -04:00
KWSys Robot de81f2a4ee KWSys Nightly Date Stamp 2010-10-24 00:11:05 -04:00
KWSys Robot 185582d5fe KWSys Nightly Date Stamp 2010-10-23 00:12:04 -04:00
KWSys Robot 91b5bc3efa KWSys Nightly Date Stamp 2010-10-22 00:10:12 -04:00
KWSys Robot e42160f3e0 KWSys Nightly Date Stamp 2010-10-21 00:11:02 -04:00
KWSys Robot 5bae7f3b19 KWSys Nightly Date Stamp 2010-10-20 00:11:01 -04:00
Bill Hoffman 3f94c7cc39 When processing DartMeasurements use the tests working directory.
Restore CMake 2.6 behavoir where the dart processing apparently was run from within the tests directory instead of the root of the build tree. This addresses issue reported on the VTK Dashboard where the Testing/Temporary directory is defined as ../../../Testing/Temporary but the DartProcessing is run with respect to the root of the build tree. This causes the regression/difference images to not be located by ctest and thus not uploaded to the dashboard.
2010-10-19 16:15:32 -04:00
David Cole 9e6eb7c8b6 Merge topic 'xcode-hh-files'
8f0a70e Xcode: Recognize .hh as C++ (#11307)
2010-10-19 15:53:54 -04:00
David Cole b0fb2ad3e1 Merge topic 'AddCMAKE_CURRENT_LIST_DIR'
b011840 Use absolute path to FindPackageHandleStandardArgs.cmake everywhere
41e4f1a Add automatic variable CMAKE_CURRENT_LIST_DIR(dir of CMAKE_CURRENT_LIST_FILE)
f9fc79c Remove trailing whitespace
2010-10-19 15:53:16 -04:00
KWSys Robot 915e5805d9 KWSys Nightly Date Stamp 2010-10-19 00:10:04 -04:00
KWSys Robot 00b327fed8 KWSys Nightly Date Stamp 2010-10-18 00:11:02 -04:00
KWSys Robot 76c8c6017c KWSys Nightly Date Stamp 2010-10-17 00:10:08 -04:00
KWSys Robot 0dc88cf853 KWSys Nightly Date Stamp 2010-10-16 00:10:08 -04:00
KWSys Robot 57c04db124 KWSys Nightly Date Stamp 2010-10-15 00:10:07 -04:00
Clinton Stimpson 249a9bb44d cmake-gui: use BundleUtilities in place of custom script.
BundleUtilities is better supported and allows including
shared Qt libs on other platforms.  Also removed limitation
of static Qt for windows build of cmake-gui.
2010-10-14 13:58:43 -06:00
KWSys Robot 3dc07529cf KWSys Nightly Date Stamp 2010-10-14 00:10:43 -04:00
KWSys Robot 68e0b6357d KWSys Nightly Date Stamp 2010-10-13 00:10:36 -04:00
David Cole fbecc534d1 Merge topic 'document-bundle-loader'
abb6e75 Document ENABLE_EXPORTS behavior on Mac (#11295)
2010-10-12 11:11:33 -04:00
David Cole 1b98d04e1a Merge topic 'vs10-order-dependencies'
973df7c VS10: Order .vcxproj dependencies deterministically (#10502)
2010-10-12 11:05:57 -04:00
David Cole f78f82ccbf Merge topic 'CodeBlocksGeneratorFixForExternalSubdirs'
9072535 CodeBlocks Generator: Do not omit files in the project file listing.
2010-10-12 11:04:53 -04:00
Brad King 8f0a70e5f0 Xcode: Recognize .hh as C++ (#11307) 2010-10-12 09:06:33 -04:00
KWSys Robot 3810da1a73 KWSys Nightly Date Stamp 2010-10-12 00:10:33 -04:00
Brad King abb6e755eb Document ENABLE_EXPORTS behavior on Mac (#11295)
Mention that it is implemented with -bundle-loader on platforms that
need link-time symbol resolution but that do not use DLL import libs.
2010-10-11 08:35:19 -04:00
KWSys Robot 3138cc503b KWSys Nightly Date Stamp 2010-10-11 00:10:06 -04:00
KWSys Robot c89527a421 KWSys Nightly Date Stamp 2010-10-10 00:10:08 -04:00
KWSys Robot 8af6a13728 KWSys Nightly Date Stamp 2010-10-09 00:10:06 -04:00
KWSys Robot 7119b5f5be KWSys Nightly Date Stamp 2010-10-08 00:10:06 -04:00