Commit Graph

24237 Commits

Author SHA1 Message Date
Stephen Kelly 07b0f54647 Qt Tests: Remove commented and unneeded line. 2014-01-04 11:28:57 +01:00
Stephen Kelly 79db8ef78d cmTarget: Fix the property compatibility error message
Don't refer to 'both', but a 'mixture'. List all compatible interface
property types possible.

Add another test for a mixture of three compatibilities.
2014-01-04 11:28:57 +01:00
Stephen Kelly 43340a9c96 Help: Reformat Qt autogenerator documentation. 2014-01-04 11:28:57 +01:00
Stephen Kelly d98ea6c0b8 Help: Mark some code blocks as containing cmake code. 2014-01-04 11:28:57 +01:00
Stephen Kelly ea78935f62 GenerateExportHeader: Reformat docs. 2014-01-04 11:28:57 +01:00
Stephen Kelly 272a20f8e5 cmTarget: Don't update IMPORTED target compilation properties
The include_directories() and add_compile_options() commands
should not append to the corresponding target property for IMPORTED
targets.  This is already the case for add_definitions().
2014-01-04 11:28:57 +01:00
Stephen Kelly 03d842a982 Run the add_compile_options command unit test.
This has not been executed since it was added in
commit a984f325 (Introduce add_compile_options command., 2013-06-04).
2014-01-04 11:28:57 +01:00
Stephen Kelly cd3d0b613e get_property: Fix testing ALIASED_TARGET target property (#14670)
In the case where the argument is not an ALIAS, the variable should
be set to a -NOTFOUND content.
2014-01-04 11:28:57 +01:00
Stephen Kelly 6a622285a7 install: Ensure that install(TARGETS) works with no DESTINATION
INTERFACE_LIBRARY targets have no corresponding files, and so
require no DESTINATION to install anything to.
2014-01-04 11:28:57 +01:00
Stephen Kelly af3d3b88be export: Only generate and install configuration files if needed.
The modern way to create configuration dependent content is using
generator expressions in the main export file.  The only non-deprecated
property still generated in the configuration-specific files are
IMPORTED_LOCATION_<CONFIG>

INTERFACE_LIBRARY targets have no location, and no need for those
files.
2014-01-04 11:28:56 +01:00
Stephen Kelly 0de81bba8c Help: Workaround pygments reporting an error for genexes.
Without the workaround, CMake code snippets are not highlighted
at all because pygments can not lex the generator expressions.
2014-01-04 11:28:56 +01:00
Stephen Kelly 0cf550b2ca Help: Remove workaround for pre-CMake 2.8.4 code.
The requirement was updated in commit 920ffbf5 (Require CMake 2.8.4
or greater to build CMake, 2013-10-11) and similar snippets were
removed.
2014-01-04 11:28:56 +01:00
Stephen Kelly 5c0a06ab84 cmTarget: Rename container holding link implementation objects.
Don't erroneously name it for the link implementation. That's
something different.
2014-01-04 11:28:56 +01:00
Stephen Kelly a0cacb5521 install: Rename variable referencing cmake version.
The next version is 3.0.0, not 2.8.13.

The version generated in the export file should be updated in
the release branch in both cmExportInstallFileGenerator and
cmExportBuildFileGenerator.
2014-01-04 11:28:56 +01:00
Stephen Kelly 5b6e9bea19 Style: Use this-> when invoking member function. 2014-01-04 11:28:56 +01:00
Stephen Kelly 6db7e6d24c add_dependencies: Disallow use with INTERFACE_LIBRARY. 2014-01-04 11:28:56 +01:00
Kitware Robot 7fb2b80662 CMake Nightly Date Stamp 2014-01-04 00:01:07 -05:00
Ruslan Baratov 9e41eb68ec Fix wording of "the the" typos throughout text 2014-01-03 11:35:32 -05:00
Brad King 196cee67f4 Merge branch 'upstream-kwsys' into update-kwsys 2014-01-03 10:21:07 -05:00
KWSys Robot 4709c7ad4e KWSys 2014-01-02 (606d7d6f)
Extract upstream KWSys using the following shell commands.

$ git archive --prefix=upstream-kwsys/ 606d7d6f | tar x
$ git shortlog --no-merges --abbrev=8 --format='%h %s' e81f2a9e..606d7d6f
Muli Baron (1):
      606d7d6f Terminal: Add putty-256color as a VT100 color-capable terminal

Change-Id: Ibd80e7b209c29947c384023d3ac1ce862648de01
2014-01-03 10:20:56 -05:00
Kitware Robot 0bb3ca2874 CMake Nightly Date Stamp 2014-01-03 00:01:13 -05:00
Brad King 6cff2afc8b Merge topic 'export-EXPORT-subcommand'
98b9f52 Help: Document export(EXPORT) in the cmake-packages manual.
a1d2bda Don't copy find_dependency in configure_package_config_file.
f4f6529 Help: cmake-packages: Add missing slash.
cbe7e8f export: Implement EXPORT subcommand (#9822)
2014-01-02 14:44:08 -05:00
Brad King 85704c04c0 Merge topic 'cmake-mode-updates'
33fa10f cmake-mode.el: Add autoload cookies
d03a0fb cmake-mode.el: Move header line to the top of file
2014-01-02 14:24:52 -05:00
Brad King 5249948e53 Merge topic 'KateProjectImprovements'
37104d9 kate: put full path to cmake into comment
424d5dc kate: support also the build plugin in kate <= 4.12
8bd6cf0 kate: the prev_target is not used by kate
2014-01-02 14:24:39 -05:00
Brad King 81311c670e Merge topic 'wix-rtf-encoding'
950d76e CPackWiX: allow and convert UTF-8 sequences in RTF writer
2014-01-02 14:24:25 -05:00
Brad King 2da175ce9d Merge topic 'wix-read-only'
44a7543 CPackWiX: transfer file read only flag during installation
2014-01-02 14:24:13 -05:00
Brad King a294ff08b7 Merge topic 'suppress-LNK4089-SHELL32'
0fd172c CTestCustom: Suppress LNK4089 warning about SHELL32
2014-01-02 14:24:03 -05:00
Brad King 7a63192074 Merge topic 'fix-compile-OBJECT_DIR'
03f3b4e Replace <OBJECT_DIR> rule placeholder consistently (#14667)
2014-01-02 14:23:52 -05:00
Brad King fef56edee7 Merge topic 'update-kwsys'
2f7c169 Merge branch 'upstream-kwsys' into update-kwsys
d4efa5f KWSys 2013-12-21 (e81f2a9e)
2014-01-02 14:23:35 -05:00
Brad King f6c85e7b36 Merge topic 'fix-ctest-regressions'
7f0d4af CTest: fix regressions introduced by the ctest-fix-run-serial topic
2014-01-02 14:23:22 -05:00
Brad King 0d63bdd2d9 Merge topic 'rpath-default'
d25ad48 OS X: Add CMP0042 to enable MACOSX_RPATH by default
2014-01-02 14:23:09 -05:00
Brad King c0ea0604a0 Merge topic 'copyright-year'
f2ec464 Copyright.txt: Update year range to end in 2014
2014-01-02 14:22:56 -05:00
Brad King f2ec464fe0 Copyright.txt: Update year range to end in 2014 2014-01-02 14:11:55 -05:00
Brad King 0fd172c8d0 CTestCustom: Suppress LNK4089 warning about SHELL32
Add a warning suppression regex to match:

 LINK : warning LNK4089: all references to 'SHELL32.DLL' discarded by /OPT:REF
2014-01-02 14:08:05 -05:00
Brad King 03f3b4e727 Replace <OBJECT_DIR> rule placeholder consistently (#14667)
The <OBJECT_DIR> placeholder is supposed to be the base intermediate
files directory for the current target.  This is how it gets replaced
during link line generation.  However, during compile line generation
we replace it with the directory containing the current object file
which may be a subdirectory.  Fix replacement of <OBJECT_DIR> in the
generated compile lines to be the base intermediate files directory.

This was expoxed by commit 42ba1b08 (VS: Separate compiler and linker
PDB files, 2013-04-05) when we added a "/Fd<OBJECT_DIR>/" flag to the
MSVC compile line in order to match the VS IDE default compiler program
database location in the intermediate files directory.  For source files
in a subdirectory relative to the current target this caused the wrong
location to be used for the compiler program database.  This becomes
particularly important when using precompiled headers.

While at it, use the cmTarget::GetSupportDirectory method to compute the
intermediate files directory for the current target instead of repeating
the logic in a few places.
2014-01-02 13:45:41 -05:00
Clinton Stimpson d25ad482e9 OS X: Add CMP0042 to enable MACOSX_RPATH by default
Also adding documentation for CMAKE_MACOSX_RPATH, and improving
documentation for MACOSX_RPATH.
2014-01-02 13:41:49 -05:00
Yasuyuki Oka 33fa10f6bc cmake-mode.el: Add autoload cookies 2014-01-02 13:15:58 -05:00
Yasuyuki Oka d03a0fb409 cmake-mode.el: Move header line to the top of file 2014-01-02 13:14:15 -05:00
Kitware Robot c0798b50d0 CMake Nightly Date Stamp 2014-01-02 00:01:08 -05:00
Alex Neundorf e6b0f452ee Eclipse: use MachO64 parser starting with Helios (#14380)
With this patch, cmake now puts the MachO64 bit
binary file parser into the config file if the detected
Eclipse is at least Helios (7.0), otherwise with the old
parser executables will not be recognized by Eclipse.

Alex
2014-01-01 17:52:57 +01:00
Kitware Robot 9e9debe505 CMake Nightly Date Stamp 2014-01-01 00:01:13 -05:00
Kitware Robot 403632c8ae CMake Nightly Date Stamp 2013-12-31 00:01:08 -05:00
Kitware Robot 1b7546c460 CMake Nightly Date Stamp 2013-12-30 00:01:27 -05:00
Alex Neundorf 37104d97b0 kate: put full path to cmake into comment
Alex
2013-12-29 21:17:32 +01:00
Alex Neundorf 424d5dc078 kate: support also the build plugin in kate <= 4.12
With this patch, simply also the information used
by the build plugin in kate <= 4.12 is put into the
generated json file. The new build plugin (coming
in 4.13) simply ignores this (and vice versa).

Alex
2013-12-29 21:17:25 +01:00
Alex Neundorf 8bd6cf0f33 kate: the prev_target is not used by kate
...this was a leftover from experimenting

Alex
2013-12-29 06:40:14 +01:00
Kitware Robot 8b275894da CMake Nightly Date Stamp 2013-12-29 00:01:05 -05:00
Kitware Robot a846670013 CMake Nightly Date Stamp 2013-12-28 00:01:11 -05:00
Kitware Robot 9f7c2bde8f CMake Nightly Date Stamp 2013-12-27 00:01:09 -05:00
Nils Gladitz 950d76ed48 CPackWiX: allow and convert UTF-8 sequences in RTF writer 2013-12-26 15:23:54 +01:00