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
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
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
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
Kitware Robot
cba6c45410
CMake Nightly Date Stamp
2013-12-26 00:01:07 -05:00
Kitware Robot
b87ce492ab
CMake Nightly Date Stamp
2013-12-25 00:01:07 -05: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
Alex Neundorf
fb107d84d2
Help: Fix Sphinx extension with docutils < 0.11
...
In older versions of python docutils "error_reporting" was not in the
"utils" subpackage, so try the older location if the new one failed.
Alex
2013-12-23 10:17:01 -05:00
Nils Gladitz
7f0d4aff24
CTest: fix regressions introduced by the ctest-fix-run-serial topic
...
The first regression resulted in endless looping due to unrun test
dependencies. The second regression prioritized all tests with dependencies
in serial test runs.
2013-12-23 15:31:15 +01:00
Kitware Robot
f350fa6c71
CMake Nightly Date Stamp
2013-12-23 00:01:07 -05:00
Kitware Robot
eb684157be
CMake Nightly Date Stamp
2013-12-22 00:01:07 -05:00
Kitware Robot
de607ff52e
CMake Nightly Date Stamp
2013-12-21 00:01:08 -05:00
Brad King
12862e939f
Help: Simplify top-level index organization
...
Revise the organization introduced in commit 2c7cd95c (Help: Organize
top-level index, 2013-10-28) to drop "Other Manuals" and put them in
"Reference Manuals" because the distinction between them has blurred.
Perhaps a better breakdown of the reference manuals will emerge in
the future.
While at it, sort the reference manual toctree by name.
2013-12-20 15:10:10 -05:00
Brad King
4372365177
Merge topic 'cmake-packages-manual'
...
3fe4ac8 Help: Add a CMake manual for Packages related docs.
20cafa2 Split the find_dependency macro into a separate file.
2013-12-20 15:01:26 -05:00
Brad King
f4fcfc6ef3
Merge branch 'upstream-kwsys' into update-kwsys
2013-12-20 14:27:36 -05:00
KWSys Robot
7aa3c2015f
KWSys 2013-12-19 (2426b57d)
...
Extract upstream KWSys using the following shell commands.
$ git archive --prefix=upstream-kwsys/ 2426b57d | tar x
$ git shortlog --no-merges --abbrev=8 --format='%h %s' 88165c5e..2426b57d
Clinton Stimpson (1):
2426b57d Encoding: Add support for program arguments argc/argv.
Change-Id: Id1fbc042a093b1de398753ffa16d4f9449e99423
2013-12-20 14:27:32 -05:00
Stephen Kelly
3fe4ac828d
Help: Add a CMake manual for Packages related docs.
2013-12-20 19:20:31 +01:00
Nils Gladitz
37a1157aa9
CPackWiX: adhere to CMake member naming convention
2013-12-20 18:12:01 +01:00
Stephen Kelly
870bd16f2c
QtAutogen: Don't modify target source files while iterating them.
...
Populate a separate vector of files and append them separately. This
was the pattern used prior to commit 035b6908 (Autogen: Split AutoRcc
handling into two methods, 2013-12-10), which was erroneously not
maintained in that refactoring.
2013-12-20 17:37:20 +01:00
David Golub
a79cbdc068
VS: Teach include_external_msproject about non-C++ projects ( #14661 )
...
Teach CMake to guess the project type guid based on the project file
extension. This allows non-C++ projects like *.vbproj or *.csproj
to be included.
2013-12-20 11:02:11 -05:00
Stephen Kelly
db7d1112ea
cmLocalGenerator: Remove VTK include hack ( #11338 ).
...
This exists for pre-CMake 2.4 compatibility. All such compatibility
code was removed for CMake 3.0, so remove this too.
2013-12-20 16:15:58 +01:00
Brad King
ae6fc555a7
cmGlobalGenerator: Fix value type pushed into autogens vector
...
The parent commit changed the AutogensType::value_type to be
"std::pair<cmQtAutoGenerators,cmTarget const*>" but our std::make_pair
call returns "std::pair<cmQtAutoGenerators,cmTarget*>". Construct the
value_type directly instead of using make_pair. Otherwise the Sun 5.9
compiler complains
".../Source/cmGlobalGenerator.cxx", line 1281: Error:
Formal argument x of type "const std::pair<cmQtAutoGenerators, const cmTarget*>&"
in call to "std::vector<std::pair<cmQtAutoGenerators, const cmTarget*> >
::push_back(const std::pair<cmQtAutoGenerators, const cmTarget*>&)" is being
passed "std::pair<cmQtAutoGenerators, cmTarget*>".
2013-12-20 10:06:45 -05:00
Brad King
6820882be5
Merge topic 'extend-policies-manual'
...
8f849b9 Help: Mention if(POLICY) and NO_POLICY_SCOPE in policies manual.
2013-12-20 09:41:52 -05:00
Brad King
053c39c4d9
Merge topic 'doc-clarify-CMAKE_VERBOSE_MAKEFILE'
...
0227ece Help: Clarify CMAKE_VERBOSE_MAKEFILE initialization (#14658 )
2013-12-20 09:41:47 -05:00
Brad King
28d9aba7d6
Merge topic 'minor-cleanup'
...
b51b6e9 Export: Skip INTERFACE libraries when generating -config files.
cad5c79 cmTarget: Fix typo
08e72a3 Automoc: Fix style
2eda924 Genex: Use case-sensitive comparison in PLATFORM_ID.
9436353 Genex: Always return immediately on error.
20a06d0 Export: Clean up comment.
f4d9466 Genex: Accept arbitrary content in *_CASE and MAKE_C_IDENTIFIER.
d36b489 Genex: Allow single param expressions to accept arbirary input.
218ad35 Constify cmStrCmp.
4cb7d79 Help: Fix CMP0037 docs.
5187580 Help: Add missing period.
2013-12-20 09:41:40 -05:00
Brad King
c57aca394e
Merge topic 'add-platform-MirBSD'
...
af7489d Add MirBSD platform support (#14659 )
2013-12-20 09:41:36 -05:00
Brad King
7974dced73
Merge topic 'make-entry-no-parallel'
...
bd11de0 Makefile: Allow "gmake target1 target2 -j" (#14312 )
2013-12-20 09:41:32 -05:00
Brad King
6f29fdd7cd
Merge topic 'update-kwsys'
...
2a943d9 Merge branch 'upstream-kwsys' into update-kwsys
f788d9a KWSys 2013-12-19 (88165c5e)
2013-12-20 09:41:27 -05:00
Brad King
221c95da88
Merge topic 'doc-TestCXXAcceptsFlag-cleanup'
...
95c705a TestCXXAcceptsFlag: Update documentation (#14657 )
2013-12-20 09:41:18 -05:00
Brad King
c6072c7806
Merge topic 'find_backtrace'
...
9650c09 FindBacktrace: Search and report only when not already found
2013-12-20 09:41:10 -05:00