kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
22,867 Commits 1 Branch 14 Tags 53 MiB
Commit Graph

22867 Commits

Author SHA1 Message Date
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
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
Kitware Robot cba6c45410 CMake Nightly Date Stamp 2013-12-26 00:01:07 -05:00
Nils Gladitz 44a7543c53 CPackWiX: transfer file read only flag during installation 2013-12-26 00:14:44 +01:00
Kitware Robot b87ce492ab CMake Nightly Date Stamp 2013-12-25 00:01:07 -05:00
Stephen Kelly 98b9f52bc9 Help: Document export(EXPORT) in the cmake-packages manual. 2013-12-24 13:02:49 +01:00
Stephen Kelly a1d2bda23e Don't copy find_dependency in configure_package_config_file. 
There is not really any need to. Downstreams can either rely on it
being provided by CMake, or copy and distribute it.

Change the documented include for the find_dependency macro.
 2013-12-24 13:02:49 +01:00
Stephen Kelly f4f6529354 Help: cmake-packages: Add missing slash. 2013-12-24 13:02:49 +01:00
Stephen Kelly cbe7e8fae4 export: Implement EXPORT subcommand (#9822) 
Teach the export command to handle export sets defined by invocations
of install(TARGETS ... EXPORT foo).  This makes maintenance of targets
exported to both the build tree and install tree trivial.
 2013-12-24 13:02:49 +01:00
Kitware Robot dfbca3b42a CMake Nightly Date Stamp 2013-12-24 00:01:08 -05:00
Brad King 2f7c169158 Merge branch 'upstream-kwsys' into update-kwsys 2013-12-23 10:51:38 -05:00
KWSys Robot d4efa5f81c KWSys 2013-12-21 (e81f2a9e) 
Extract upstream KWSys using the following shell commands.

$ git archive --prefix=upstream-kwsys/ e81f2a9e | tar x
$ git shortlog --no-merges --abbrev=8 --format='%h %s' 2426b57d..e81f2a9e
Clinton Stimpson (1):
      e81f2a9e FStream: Fix opening non-existant file.

Change-Id: I1f79e6671de7733d1b8e8a34ce627749c2f666b7
 2013-12-23 10:51:34 -05:00
Brad King e73d1ad003 Merge topic 'MakeDocsWorkWithDocutilsBefore0_11' 
fb107d8 Help: Fix Sphinx extension with docutils < 0.11
 2013-12-23 10:21:05 -05:00
Brad King c23332c3c0 Merge topic 'doc-organize-index' 
12862e9 Help: Simplify top-level index organization
 2013-12-23 10:19:43 -05:00
Brad King 7f3ead9bd0 Merge topic 'update-kwsys' 
f4fcfc6 Merge branch 'upstream-kwsys' into update-kwsys
7aa3c20 KWSys 2013-12-19 (2426b57d)
 2013-12-23 10:19:35 -05:00
Brad King b5ef7fd47e Merge topic 'wix-cmake-coding-conventions' 
37a1157 CPackWiX: adhere to CMake member naming convention
 2013-12-23 10:19:29 -05:00
Brad King 4dd2382a6e Merge topic 'fix-Qt-rcc-file-handling' 
870bd16 QtAutogen: Don't modify target source files while iterating them.
 2013-12-23 10:19:24 -05:00
Brad King 11ddaa51ea Merge topic 'vs-external-project-type' 
a79cbdc VS: Teach include_external_msproject about non-C++ projects (#14661)
 2013-12-23 10:19:10 -05:00
Brad King b646ae88fa Merge topic 'remove-VTK-include-hack' 
db7d111 cmLocalGenerator: Remove VTK include hack (#11338).
 2013-12-23 10:19:00 -05:00
Brad King 1e8d4b5f46 Merge topic 'constify' 
ae6fc55 cmGlobalGenerator: Fix value type pushed into autogens vector
 2013-12-23 10:18:51 -05:00
Brad King a61bec581e Merge topic 'wix-fix-registry-slash' 
7eea71e CPackWiX: replace slash with backslash in registry key path
 2013-12-23 10:18:43 -05:00