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
Brad King
bd11de0857
Makefile: Allow "gmake target1 target2 -j" ( #14312 )
...
Add the .NOTPARALLEL target to each local Makefile command-line
interface entry point file so that even with -j we launch only
one "make -f Makefile2" at a time. The actual build rules
in Makefile2 and lower will still run in parallel.
Do not add .NOTPARALLEL for Borland or Watcom make tools because
they do not tolerate it. Other make tools that do not understand
.NOTPARALLEL will not be hurt.
Suggested-by: Robert Luberda <robert-cmake@debian.org>
2013-12-20 09:35:20 -05:00
Stephen Kelly
8f849b9071
Help: Mention if(POLICY) and NO_POLICY_SCOPE in policies manual.
2013-12-20 12:32:43 +01:00
Nils Gladitz
7eea71ea57
CPackWiX: replace slash with backslash in registry key path
...
Forward slash is not understood as a key path separator.
2013-12-20 12:01:28 +01:00
Kitware Robot
a0ce1e36b6
CMake Nightly Date Stamp
2013-12-20 00:01:24 -05:00
Stephen Kelly
b51b6e97a2
Export: Skip INTERFACE libraries when generating -config files.
...
The properties object has just been created, so is always empty,
which means the if block is never entered. The following lines do
not have any effect because an INTERFACE library has no LOCATION.
At the end, no code is generated for INTERFACE libraries in
config-specific exported files, so skip them early.
2013-12-20 00:56:17 +01:00
Brad King
0227ece0a6
Help: Clarify CMAKE_VERBOSE_MAKEFILE initialization ( #14658 )
...
Explain that it is initialized to false by the project() command and
intended for configuration by the end user performing a build.
2013-12-19 14:48:51 -05:00
Dimitri John Ledkov
f293d525a1
GNUInstallDirs: Use multiarch on Debian with FreeBSD and HURD kernels
2013-12-19 11:27:30 -05:00
Brad King
af7489d5a6
Add MirBSD platform support ( #14659 )
...
Add a Modules/Platform/MirBSD.cmake module that just includes the
OpenBSD platform module.
2013-12-19 11:08:28 -05:00
Brad King
2a943d9264
Merge branch 'upstream-kwsys' into update-kwsys
2013-12-19 10:44:29 -05:00
KWSys Robot
f788d9a1b2
KWSys 2013-12-19 (88165c5e)
...
Extract upstream KWSys using the following shell commands.
$ git archive --prefix=upstream-kwsys/ 88165c5e | tar x
$ git shortlog --no-merges --abbrev=8 --format='%h %s' 1010d0e3..88165c5e
Clinton Stimpson (2):
ab6f8c36 FStream: Fix rdbuf() return and use use of FStream in SystemTools.
88165c5e Encoding: Fix bug in kwsysEncoding_DupToNarrow.
Rolf Eike Beer (2):
d2bcbe11 SystemInformation: extract CPU information on Linux/Sparc
b2fd7da5 ProcessUNIX: close /proc entry before starting recursion
Ådne Hovda (1):
a02a1ad2 SystemInformation: Fix compilation on HP-UX 11.11 hppa
Change-Id: I225e0517379d88612f18215b43c7d6a9daad6326
2013-12-19 10:44:24 -05:00
Brad King
95c705a6a9
TestCXXAcceptsFlag: Update documentation ( #14657 )
...
Document this module as deprecated and link to CheckCXXCompilerFlag.
Fix cut-n-paste-o and format macro signature.
2013-12-19 10:41:40 -05:00
Vadim Zhukov
9650c09b95
FindBacktrace: Search and report only when not already found
...
Avoid saying "... detected in default set..." each time CMake is run.
Prompted by Rolf Eike Beer on cmake-developers@.
2013-12-19 10:22:04 -05:00
Stephen Kelly
cad5c79e6c
cmTarget: Fix typo
...
'a ALIAS' -> 'an ALIAS'
2013-12-19 16:17:59 +01:00
Stephen Kelly
08e72a34e9
Automoc: Fix style
...
Insert whitespace before operators.
2013-12-19 16:17:59 +01:00
Stephen Kelly
2eda924389
Genex: Use case-sensitive comparison in PLATFORM_ID.
2013-12-19 16:17:59 +01:00
Stephen Kelly
9436353f94
Genex: Always return immediately on error.
2013-12-19 16:17:59 +01:00
Stephen Kelly
20a06d01f7
Export: Clean up comment.
...
Introduced in commit a4263c9f
(export(): Handle multiple dependent export
sets., 2013-10-10)
2013-12-19 16:17:59 +01:00
Stephen Kelly
f4d9466130
Genex: Accept arbitrary content in *_CASE and MAKE_C_IDENTIFIER.
2013-12-19 16:17:59 +01:00
Stephen Kelly
d36b489401
Genex: Allow single param expressions to accept arbirary input.
...
Existing single-parameter expressions work due to special casing
which assumes that if there is only one parameter, and the node
accepts arbitrary content, then the result is the input.
This is true for the existing expressions matching that
pattern - namely the "1" and "TARGET_NAME" expressions. However,
the LOWER_CASE, and UPPER_CASE expressions should also accept
arbitrary content, and in their case, the result is not the input.
Refactor the cmGeneratorExpressionEvaluator to allow that extension.
Actually evaluate the "1" and "0" nodes.
2013-12-19 16:17:59 +01:00
Stephen Kelly
218ad35f96
Constify cmStrCmp.
2013-12-19 16:17:58 +01:00
Stephen Kelly
4cb7d792af
Help: Fix CMP0037 docs.
...
INTERFACE libraries may not use double-colons, but IMPORTED
targets may.
2013-12-19 16:17:58 +01:00
Stephen Kelly
5187580bcd
Help: Add missing period.
2013-12-19 16:17:58 +01:00
Brad King
b375c18b9e
Merge topic 'doc-clarify-if-TARGET'
...
6b8662e
Help: Clarify if(TARGET) behavior (#14646 )
b74819e
Help: Format 'if' command documentation
2013-12-19 10:13:53 -05:00
Brad King
eb20fab736
Merge topic 'wix-fragment-injection'
...
8632233
CPackWiX: allow customization of generated WiX sources
2013-12-19 10:13:47 -05:00
Brad King
3b00ff84d2
Merge topic 'GenerateExportHeader-tests'
...
2410b91
Merge some GenerateExportHeader subtests.
4017db1
Speed up the GenerateExportHeader unit test (#14453 ).
2013-12-19 10:13:38 -05:00
Brad King
5a56da919a
Merge topic 'build-symlink-invalid-sup-file'
...
57c008c
Tests: allow valgrind test to pass with symlinked build dir
2013-12-19 10:13:34 -05:00
Brad King
0845aaddc5
Merge topic 'minor-cleanup'
...
e2cb3e7
Help: Note that COMPATIBLE_INTERFACE_ properties may be origin-debugged.
41e48c4
Avoid certain actions on IMPORTED targets.
2013-12-19 10:13:29 -05:00
Brad King
aed192d2cd
Merge topic 'Qt4-NO_DEBUG-define'
...
3e97bcb
Use a config-specific moc parameters file, if needed.
b9f0d81
Define QT_NO_DEBUG for non-debug use of Qt 4.
2013-12-19 10:13:23 -05:00
Brad King
2e075b48e8
Merge topic 'constify'
...
c62cd3e
Constify autogen handling.
035b690
Autogen: Split AutoRcc handling into two methods
2fcafbf
cmLocalGenerator: Constify target definitions access
a54eedd
Constify cmGeneratorTarget access.
9edee62
Constify handling of link targets.
ef25ba8
Constify handling of target dependencies.
2013-12-19 10:13:18 -05:00
Brad King
cc054e94f8
Merge topic 'FindSubversion-TortoiseSVN'
...
62c276f
FindSubversion: Use TortoiseSVN registry key to locate svn
2013-12-19 10:13:09 -05:00
Brad King
d42e0d552c
Merge topic 'remove-INTERFACE-build-targets'
...
97fae68
Remove INTERFACE build targets.
2013-12-19 10:12:57 -05:00
Brad King
33498bba9c
Merge topic 'KateFixNinja'
...
c3d20c2
kate: fix ninja support
1eaf2f2
kate: remove unused function
2013-12-19 10:12:49 -05:00
Brad King
a1e58db675
Merge topic 'fix-INTERFACE-mapped-config'
...
3b8e56a
Don't search for IMPORTED_LOCATION of INTERFACE_LIBRARY (14636)
2013-12-19 10:12:42 -05:00
Brad King
bddc437d35
Merge topic 'libarchive-left-shift-fix'
...
0bff4df
libarchive: Use ARCHIVE_LITERAL_ULL to add ULL integer suffix
61b39af
libarchive: Port upstream issue 320 second fix
2013-12-19 10:12:37 -05:00
Brad King
e15b14d431
Merge topic 'vtk-contract'
...
ad330ed
Tests/Contracts: Submit notes with VTK build
2013-12-19 10:12:29 -05:00
Brad King
172f37be33
Merge topic 'FindFreetype-2.5'
...
9b08e3f
FindFreetype: Remove duplicates in FREETYPE_INCLUDE_DIRS
bc49d82
FindFreetype: Detect version string with Freetype 2.5
7435ae7
FindFreetype: Find ftheader.h with Freetype 2.5
2013-12-19 10:12:25 -05:00
Brad King
b891af9290
Merge topic 'xcode-5.1'
...
65ee85d
CMakeDetermineCompilerId: Fix compiler line match for Xcode 5.1
2013-12-19 10:12:18 -05:00
Alex Neundorf
c3d20c2ac9
kate: fix ninja support
...
ninja needs to be run from the toplevel build dir,
not from the target dir, as make
Alex
2013-12-19 10:04:00 -05:00
Alex Neundorf
1eaf2f263b
kate: remove unused function
...
Alex
2013-12-19 10:03:34 -05:00
Zack Galbreath
ad330edaa2
Tests/Contracts: Submit notes with VTK build
...
Submit the configured Dashboard script as as Notes file to CDash.
Also add comments about the origin & purpose of this test.
2013-12-19 10:01:14 -05:00
Kitware Robot
2f0ff16418
CMake Nightly Date Stamp
2013-12-19 00:01:06 -05:00
Brad King
6b8662e681
Help: Clarify if(TARGET) behavior ( #14646 )
...
Define the meaning of a "target" clearly and link to the commands
that create them.
2013-12-18 12:15:43 -05:00
Brad King
b74819e4fe
Help: Format 'if' command documentation
...
Manually update reStructuredText formatting. Use a definition list
for the possible if() tests supported. Add inline literal markup
as appropriate. Also make minor wording tweaks to make it flow
better with the new markup.
2013-12-18 12:14:24 -05:00
Kitware Robot
2a384e08cc
CMake Nightly Date Stamp
2013-12-18 00:01:09 -05:00
Nils Gladitz
8632233a2f
CPackWiX: allow customization of generated WiX sources
...
Added a new variable CPACK_WIX_PATCH_FILE that users can point at an
XML patch file. Fragments defined within the patch file will be inserted
at supported insertion points (currently Component, File and Directory).
2013-12-17 14:14:42 +01:00
Kitware Robot
400ce73e0f
CMake Nightly Date Stamp
2013-12-17 00:01:05 -05:00
Kitware Robot
b4fdbba55a
CMake Nightly Date Stamp
2013-12-16 00:01:07 -05:00