Alexander Neundorf
298de4374b
Major improvement of the generated targets in Eclipse.
...
Before this change all targets were displayed in the top level directory of
the project. Now the targets are displayed in the correct directory.
The targets "clean" and "all" are now created in every subdirectory.
Also now the targets for just compiling one file, preprocessing one file,
assembling one file are are created for Eclipse.
Additionally all targets get a prefix now in eclipse, so that they are
sorted in a way which makes sense (global targets first, then executable and
libraries, then object files, then preprocessed, then assembly). Also
this prefix gives the user a hint what the target is, i.e. whether it's a
library or an executable or something else.
Alex
2009-09-16 18:01:23 -04:00
Brad King
04b834f1b4
BUG: Disable color makefile inside try-compile
...
Generated makefiles for try-compile projects should never use color
output. On MSYS the color escapes end up in the try-compile output text
because there is no way to identify whether the output is going to a
color-capable terminal. Instead we should just always skip color for
try-compile projects.
2009-07-21 11:58:43 -04:00
Brad King
a3a046643a
ENH: Pass config to cmTarget RPATH install methods
...
This passes the build configuration to cmTarget methods IsChrpathUsed
and NeedRelinkBeforeInstall. Later these methods will use the value.
2009-07-08 13:03:47 -04:00
Brad King
cd83f1979d
ENH: Cleanup make progress rule generation code
...
This cleans up the Makefile generator's progress rule code. Instead of
keeping every cmMakefileTargetGenerator instance alive to generate
progress, we keep only the information necessary in a single table.
This approach keeps most of the code in cmGlobalUnixMakefileGenerator3,
thus simplifying its public interface.
2009-06-25 09:58:51 -04:00
Brad King
b9a98ef65b
STYLE: Remove unused variable
2009-06-25 09:43:19 -04:00
Brad King
c8795101a4
ENH: Skip 'SHELL = /bin/sh' in Makefiles on VMS
...
This shell does not exist on VMS, so we leave it out.
2009-06-10 13:03:37 -04:00
Brad King
516add4d58
ENH: On VMS use _dir and _tmp, not .dir and .tmp
...
The VMS posix path emulation does not handle multiple '.' characters in
file names in all cases. This avoids adding extra '.'s to file and
directory names for target directories and generated files.
2009-06-10 13:03:11 -04:00
Brad King
39f8b91125
BUG: Remove implicit include dir suppression
...
We used to suppress generation of -I/usr/include (and on OSX also
-I/usr/local/include). This behavior seems to cause more trouble than
it's worth, so I'm removing it until someone encounters the original
problem it fixed. See issue #8598 .
2009-02-24 15:37:09 -05:00
Brad King
15c52e9891
ENH: Add rule substitutions useful for launchers
...
This defines make rule substitutions <LANGUAGE>, <TARGET_NAME>,
<TARGET_TYPE>, and <OUTPUT>. They will be useful for RULE_LAUNCH_*
property values.
2009-02-10 08:52:07 -05:00
Brad King
b604b98c56
ENH: Define RULE_LAUNCH_* properties
...
This defines global, directory, and target properties
RULE_LAUNCH_COMPILE, RULE_LAUNCH_LINK, and RULE_LAUNCH_CUSTOM. Their
values specify 'launcher' command lines which are prefixed to compile,
link, and custom build rules by Makefile generators.
2009-02-10 08:51:15 -05:00
Brad King
c895d9f2e0
ENH: Give target in which custom commands build
...
This gives the cmTarget instance for which custom command rules are
being generated to cmLocalUnixMakefileGenerator3::AppendCustomCommands.
It will be useful in the future.
2009-02-10 08:50:33 -05:00
Alexander Neundorf
bd92bec66c
STYLE: fix two typos in the comments, patch from Daniel DOT Teske AT Nokia DOT com, QtCreator developer
...
Alex
2009-02-09 16:36:56 -05:00
Brad King
ac9b7ec155
ENH: Refactor custom command rule hashing
...
This simplifies computation of custom command rule hashes to hash
content exactly chosen as the custom commands are generated.
Unfortunately this will change the hashes of existing build trees from
earlier CMake versions, but this is not a big deal. The change is
necessary so that in the future we can make optional adjustments to
custom command lines at generate time without changing the hashes every
time the option is changed.
2009-02-02 13:28:12 -05:00
Brad King
3cf9265fa7
ENH: Refactor passing of max length object dir
...
When computing the maximum length full path to the build directory under
which object files will be placed, pass the actual path instead of just
its length. This will be useful for error message generation.
2008-12-16 09:14:40 -05:00
Brad King
ad44a41a18
ENH: Fix optional use of relative paths.
...
These changes refactor cmLocalGenerator methods Convert and
ConvertToOutputForExisting to support references inside the build tree
using relative paths. After this commit, all tests pass with Makefile
generators when relative paths are enabled by default. See issue #7779 .
2008-10-09 15:30:07 -04:00
Brad King
416bf5730f
ENH: Simplify makefile ref to interactive editor
...
The CMAKE_EDIT_COMMAND make variable need not be constructed with
ConvertToOutputForExisting. The CMAKE_COMMAND variable works fine
without it.
2008-10-09 15:08:53 -04:00
Brad King
934c832cba
BUG: Fix convenience rule working directory
...
We generate convenience rules to build object files, preprocessed
outputs, and assembly outputs of source files individually with make
rules. This removes a redundant working directory change when more than
one target builds the same source file.
2008-10-06 11:04:06 -04:00
Brad King
a1bb7e90ef
ENH: Allow users to specify macro-like #include line transforms for dependency scanning.
...
- Define IMPLICIT_DEPENDS_INCLUDE_TRANSFORM property on targets and directories.
- Make the directory version inherited.
- See issue #6648 .
2008-05-14 11:54:52 -04:00
Brad King
071725a1c1
BUG: Fix generation of some paths into .cmake files in the build tree to escape strings for the CMake language. This fix allows users to put double quotes in the SOVERSION of a shared library.
2008-05-10 18:39:06 -04:00
Brad King
09dd298f63
BUG: Fix logic that loops over multiple output pairs to not loop beyond the vector when there are an odd number of entries.
2008-05-10 18:39:00 -04:00
Brad King
12935b1599
ENH: Light refactoring of implicit dependency scanning configuration implementation.
...
- Move lookup of config variables from cmLocalUnixMakefileGenerator3 to cmDepends hierarchy.
2008-05-08 10:09:14 -04:00
Brad King
55606b155e
BUG: Fix repeated re-scanning of dependencies when the results do not change.
...
- We re-scan deps when DependInfo.cmake is newer than depend.internal
- Therefore depend.internal should not be copy-if-different
2008-05-07 17:25:05 -04:00
Brad King
9631c499dc
BUG: For Watcom WMake use the short path to avoid quoting problems in custom commands with shell redirections.
2008-04-30 15:58:56 -04:00
Bill Hoffman
d1281f5cbc
BUG: the sun make goes into some odd n squared thing with this sccs and rcs stuff for gmake, so I am removing them.
2008-04-10 11:55:49 -04:00
Bill Hoffman
5905d79c8a
ENH: fix for watcom can't use phony
2008-03-25 10:11:48 -04:00
Bill Hoffman
a24ff4e453
ENH: add PHONY targets
2008-03-24 10:26:38 -04:00
Bill Hoffman
dec1221f0b
ENH: exclude borland make as well
2008-03-18 11:51:23 -04:00
Bill Hoffman
cb512cd513
ENH: turn off extra rules for nmake and wmake
2008-03-18 11:28:59 -04:00
Bill Hoffman
813779d962
ENH: try to improve make speed by getting rid of some implicit rules that were still around.
2008-03-18 10:02:31 -04:00
Bill Hoffman
5ab6c0f0ed
ENH: remove abort calls and replace with an IssueMessage INTERANL_ERROR, better to not crash on the end user.
2008-03-12 21:06:32 -04:00
Brad King
b78997d71d
BUG: Fix subtle bug that prevented Makefile generators from rescanning dependencies when a new source file is added but no other sources are touched.
2008-03-11 17:53:54 -04:00
Brad King
9ed4266306
ENH: Cleanup impl of PUBLIC_HEADER, PRIVATE_HEADER, and RESOURCE properties
2008-02-18 16:38:34 -05:00
Brad King
342a32a2c0
BUG: Apply patch from bug #6180 to make CMAKE_ADDITIONAL_MAKE_CLEAN_FILES work for directories.
2008-02-15 11:56:13 -05:00
Brad King
ed76198b84
ENH: Cleanup building of OS X bundle content
...
- Fixes repeated rebuild of bundles by Makefile generators
- Add special rules to copy sources to their
MACOSX_PACKAGE_LOCATION bundle directory
- Remove MacOSX_Content language hack
- Remove EXTRA_CONTENT property
- Remove MACOSX_CONTENT
- Remove corresponding special cases in object names
2008-02-15 11:22:23 -05:00
Ken Martin
7c473d4828
BUG: fix bugs 5539 (progress going beyond 100% when new files are added) and 5889 (tests are not found in some cases when using add_subdirectory to .. etc)
2008-01-18 10:25:25 -05:00
Brad King
6ad79d13dd
BUG: Construction of COMPILE_DEFINITIONS_<CONFIG> property name must use upper-case config name.
2008-01-18 08:35:37 -05:00
Brad King
8d1d5500c8
ENH: Enable use of COMPILE_DEFINITIONS property for Fortran sources.
2008-01-17 19:58:01 -05:00
Brad King
8262ccfd4e
ENH: Create COMPILE_DEFINITIONS property for targets and source files. Create <config>_COMPILE_DEFINITIONS property as per-configuration version. Add Preprocess test to test the feature. Document limitations on Xcode and VS6 generators.
2008-01-14 09:20:58 -05:00
Brad King
b761da39c1
ENH: Patch from Maik to add preprocessor directive handling to Fortran dependency scanning. Also added -fpp flag to Intel Fortran compiler on Windows by default.
2008-01-09 10:30:11 -05:00
Brad King
52eb0ccac7
BUG: Restore old interface of "make foo.o" and "make foo.i" even though object file names now include source extensions. For Java we also need to always remove the source extension (.java -> .class). This fixes the re-opening of bug #6169 .
2008-01-07 16:12:37 -05:00
Brad King
c7de81f9a6
ENH: Make the Fortran compiler id available to cmDependsFortran at scanning and module timestamp copy time.
2008-01-02 11:04:52 -05:00
Brad King
81f6e86f12
ENH: Add per-language clean rule generation to cmake_clean.cmake files to include cmake_clean_<lang>.cmake files generated by dependency scanning. Add Fortran module file and timestamp cleaning rules.
2007-12-28 11:50:14 -05:00
Brad King
430296dc96
ENH: Moved global inter-target dependency analysis and cycle-prevention code up from cmGlobalUnixMakefileGenerator3 to cmGlobalGenerator. Simplified cmGlobalUnixMakefileGenerator3 to use it. Later other generators may be modified to use it also.
2007-12-23 15:03:42 -05:00
Brad King
4d360f7ac5
ENH: Convert cmDepends object interface to scan an entire target at once.
2007-12-22 22:41:42 -05:00
Brad King
d83b4cd255
ENH: Add a depends check step to custom targets. Add support for the IMPLICIT_DEPENDS feature of custom commands when building in custom targets. Convert multiple-output pair checks to be per-target instead of global.
2007-12-21 12:22:12 -05:00
Brad King
011d7db6bd
BUG: Fix make depend target in subdirectory Makefile interface.
2007-12-19 17:54:24 -05:00
Brad King
73704ede42
ENH: Enabled color printing of "Scanning dependencies of target ..." message.
2007-12-19 17:15:41 -05:00
Brad King
de96fd1df9
ENH: Moved dependency integrity check from CheckBuildSystem over to a per-target UpdateDependencies step. This greatly reduces the startup time for make processes and allows individual targets to be built without a global dependency check.
2007-12-19 16:36:30 -05:00
Brad King
891256546b
ENH: Pass target directory to cmDependsFortran scanning instances.
2007-12-19 14:28:46 -05:00
Brad King
872553de7e
ENH: Implemented generation of display for pre-build, pre-link, and post-build custom command comments during the build. This addresses issue #5353 .
2007-12-18 09:50:08 -05:00
Brad King
44f38c9b86
ENH: Fortran include path is the same as C and CXX include paths.
2007-12-17 17:54:43 -05:00
Brad King
cc0386f7ea
BUG: Fixed computation of 'object' name for MACOSX_PACKAGE_LOCATION source files.
2007-11-26 10:01:49 -05:00
Brad King
9f1eea193e
BUG: Dependency scanners should have local generators set always.
2007-10-12 09:32:48 -04:00
David Cole
fa61182de8
ENH: Improvements to the Xcode generator. Build frameworks using native Copy Headers and Copy Bundle Resources phases. Fix bugs: eliminate folders with no names, ensure source files show up in multiple targets, remove empty utility targets from Sources subtrees, ensure that fileRefs only show up once in each grouping folder.
2007-08-14 11:45:15 -04:00
Brad King
d926792066
ENH: Replaced dependency integrity map with an explicit map from object file to source file for each language in each target. This simplifies creation of implicit dependency scanning rules and allows more than one object file in a target to start dependency scanning with the same source file.
2007-08-07 13:57:13 -04:00
Brad King
bffcff4530
ENH: Added warning when an install rule is created from an EXCLUDE_FROM_ALL target. Added a foo/preinstall version of targets that need relinking so that exclude-from-all targets can be manually relinked for installation.
2007-08-03 16:31:08 -04:00
Brad King
ea874415d9
ENH: Moved GetTargetDirectory method up to cmLocalGenerator. This provides a common interface to something that was implemented in most local generators anyway.
2007-08-01 15:25:40 -04:00
Alexander Neundorf
179943bf14
STYLE: move ForceVerboseMakefiles to cmGlobalUnixMakefileGenerator3, so the
...
kdevelop generator doesn't need its own CreateLocalGenerator() anymore
Alex
2007-06-05 16:35:24 -04:00
Brad King
702d785c9a
BUG: Add ./ to custom command executables in the top of the build tree even when the path is generated by target name replacement.
2007-05-23 12:05:05 -04:00
Alexander Neundorf
4878c00905
ENH: add the IMPORT keyword to ADD_EXECUTABLE(), which generates an
...
"imported" executable target. This can then be used e.g. with
ADD_CUSTOM_COMMAND() to generate stuff. It adds a second container for
"imported" targets, and FindTarget() now takes an additional argument bool
useImportedTargets to specify whether you also want to search in the
imported targets or only in the "normal" targets.
Alex
2007-05-22 10:24:59 -04:00
Alexander Neundorf
df8f550029
ENH: add install/strip target for makefile generators if strip was found
...
Alex
2007-05-18 13:43:39 -04:00
Brad King
c25d2bfdd2
ENH: Added testing for custom command line arguments containing all special characters on the US keyboard. Fixed curly brace arguments on borland and % arguments in mingw32-make.
2007-05-17 10:53:18 -04:00
Brad King
142210997f
BUG: Watcom WMake needs empty rule commands even for symbolic targets. This fixes the cmake_force target.
2007-05-16 13:24:17 -04:00
Bill Hoffman
76dd86b410
BUG: fix -D escaped quotes for watcom
2007-05-10 14:43:55 -04:00
Alexander Neundorf
7f11536704
ENH: now target names can be used in add_custom_command() and
...
add_custom_target() as COMMAND, and cmake will recognize them and replace
them with the actual output path of these executables. Also the dependency
will be added automatically. Test included.
ENH: moved TraceVSDependencies() to the end of GlobalGenerator::Configure(),
so it is done now in one central place
Alex
2007-05-09 08:25:45 -04:00
Brad King
fc7c433463
ENH: Added support for import libraries created by executable and module targets. The module import libraries should never be used but some windows compilers always create them for .dll files since there is no distinction from shared libraries on that platform. The executable import libraries may be used to create modules that when loaded bind to symbols from the executables. This is an enhancement related to bug#4210 though not requested by it explicitly.
2007-03-19 10:00:36 -04:00
Brad King
144c605525
BUG: Need to include relative path top information in directory information so that relative path conversion during dependency generation works with the same rules as project generation.
2007-03-16 16:48:27 -04:00
Brad King
1f639ee76c
ENH: Added computation of object file names that are almost always short enough to not exceed the filesystem path length limitation. This is useful when a source file from outside the tree is referenced with a long full path. The object file name previously would contain the entire path which when combined with the build output directory could exceed the filesystem limit. Now CMake recognizes this case and replaces enough of the beginning of the full path to the source file with an md5sum of the replaced portion to make the name fit on disk. This addresses bug#4520.
2007-03-16 10:34:25 -04:00
Brad King
9da6f96d98
BUG: Reverting previous changes related to using an empty string for a relative path to the current directory. Too many places want the . version. Instead we can just convert the . to an empty string in the one place that motiviated the original change.
2007-03-14 16:29:10 -04:00
Brad King
33ee83714d
ENH: Replaced LibraryOutputPath and ExecutableOutputPath variables in Makefile and VS generators to instead ask each target for its output path. This significantly reduces total code size and centralizes previously duplicate code. It is also a step towards bug#2240.
2007-03-08 14:57:28 -05:00
Brad King
ea19994b13
ENH: Ask the target for its own directory in case of bundle instead of directly using ExecutableOutputPath.
2007-03-08 14:15:45 -05:00
Brad King
d65db7c6bb
BUG: Compute HomeRelativeOutputPath following the rules of RelativePathTopBinary by going through the Convert() method. This supports out-of-binary build trees without using relative paths that go outside trees managed by CMake.
2007-03-08 13:19:39 -05:00
Brad King
fd3688fa72
ENH: Fixed recursive make call target escaping for Borland to support SubDirSpaces test.
2007-03-08 13:05:02 -05:00
Brad King
7157743d69
ENH: Updated GetRecursiveMakeCall to use EscapeForShell instead of MAKEFILE conversion. This code is special because it is the only place that a make target name is passed on a command line.
2007-03-08 11:49:30 -05:00
Brad King
00051cf721
ENH: Removed useless method ConvertToMakeTarget and all calls to it. It had a buggy implementation that caused it to do nothing.
2007-03-08 11:10:21 -05:00
Brad King
00b4eeeded
STYLE: Removed unused calls to Convert.
2007-03-08 10:19:25 -05:00
Bill Hoffman
ecbec236b1
ENH: one more pass at paths with spaces and parens
2007-02-28 14:29:26 -05:00
Brad King
6c82483cdb
BUG: Fix for cmake_force target in Borland Makefiles.
2007-02-28 09:33:25 -05:00
Bill Hoffman
5ae48cf852
ENH: add a fix for spaces in the path again...
2007-02-27 13:34:12 -05:00
Bill Hoffman
0ce8c158cc
ENH: fix for spaces in the path and mingw
2007-02-27 12:10:42 -05:00
Bill Hoffman
5647e6e254
ENH: fix parens in the path with spaces in the path
2007-02-21 21:24:17 -05:00
Ken Martin
e7ab8a0e1d
ENH: fixed more bugs with spaces in the path
2007-02-19 14:25:45 -05:00
Ken Martin
314f5f60a0
BUG: fix for spaces in path for nmake
2007-02-19 12:26:32 -05:00
Bill Hoffman
ca0230a33e
ENH: check in initial conv library stuff
2007-02-16 16:12:17 -05:00
Brad King
712345ffc4
BUG: The .pdb file generated for a library or executable should match the real file name used for the target. This addresses bug#3277.
2007-02-01 09:57:24 -05:00
Bill Hoffman
ccb77b65c6
ENH: unify version stuff, get rid of it out of cmake and cmMakefile and only use cmVersion
2006-11-29 15:59:16 -05:00
Brad King
69356d8a7a
BUG: Juse use cmake -E echo instead of the native echo on MinGW makefiles. The echo; hack did not work when running from ctest.
2006-10-13 10:22:45 -04:00
Brad King
f0c79a0030
BUG: Avoid duplicate conversion to output path.
2006-10-10 13:47:50 -04:00
Brad King
7e92f0b4e4
BUG: Hack to make echo command work properly in mingw32-make.
2006-10-05 14:51:20 -04:00
Brad King
406f3554c7
BUG: Fixed display of custom command comments with quotes, dollars, and other special characters in them.
2006-10-04 18:52:29 -04:00
Brad King
28921d907f
BUG: Fixed inclusion of progress.make from subdirectory makefiles.
2006-09-29 09:11:22 -04:00
Brad King
bd6aaef001
BUG: Moved progress.make file into CMakeFiles subdirectory to keep things clean.
2006-09-28 17:21:50 -04:00
Brad King
0b135767d6
BUG: Do not filter system directories for include file dependencies.
2006-09-28 09:49:40 -04:00
Brad King
dd332a00cc
ENH: Re-implemented command line argument shell quoting to support several platforms with one code base.
2006-09-27 13:43:46 -04:00
Brad King
a8426f55e5
COMP: Fix shadowed local variable created by previous cmake_force change.
2006-09-21 17:21:13 -04:00
Brad King
2459ceb076
BUG: Centralized generation of command line arguments in escaped form. This addresses bug#3786 for several platforms.
2006-09-21 15:14:06 -04:00
Brad King
358b947072
BUG: cmake_force needs to be written into build.make as well as Makefile.
2006-09-20 12:13:50 -04:00
Brad King
76f6ea8011
BUG: Fixed ordering of code generated in Makefile and build.make files to make sure .SUFFIXES rule comes as early as possible. Also cleaned up documentation in generated files.
2006-09-08 10:42:14 -04:00
Brad King
fd8236c862
BUG: Patch from Alex to fix name of includecache files to not look like source files.
2006-09-02 10:51:54 -04:00
Brad King
409f70bc91
ENH: Make sure all custom command outputs are up to date before scanning dependencies. This avoids the need to pass a list of generated files to the dependency scanning code and to rescan after the files have been generated. Currently there is no notion of implicit dependencies of the custom commands themselves so this design is safe. We only need to make sure implicit dependencies are up to date before the make process for the /build part of a target is executed because only this process loads them. This is a step towards fixing bug#3658.
2006-08-31 14:09:56 -04:00