summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'extend-policies-manual'Brad King2013-12-201-1/+15
|\ | | | | | | | | 8f849b9 Help: Mention if(POLICY) and NO_POLICY_SCOPE in policies manual.
| * Help: Mention if(POLICY) and NO_POLICY_SCOPE in policies manual.Stephen Kelly2013-12-201-1/+15
| |
* | Merge topic 'doc-clarify-CMAKE_VERBOSE_MAKEFILE'Brad King2013-12-201-4/+5
|\ \ | | | | | | | | | | | | 0227ece Help: Clarify CMAKE_VERBOSE_MAKEFILE initialization (#14658)
| * | Help: Clarify CMAKE_VERBOSE_MAKEFILE initialization (#14658)Brad King2013-12-191-4/+5
| | | | | | | | | | | | | | | Explain that it is initialized to false by the project() command and intended for configuration by the end user performing a build.
* | | Merge topic 'minor-cleanup'Brad King2013-12-2012-58/+56
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | Export: Skip INTERFACE libraries when generating -config files.Stephen Kelly2013-12-191-7/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | cmTarget: Fix typoStephen Kelly2013-12-193-3/+3
| | | | | | | | | | | | | | | | 'a ALIAS' -> 'an ALIAS'
| * | | Automoc: Fix styleStephen Kelly2013-12-191-3/+3
| | | | | | | | | | | | | | | | Insert whitespace before operators.
| * | | Genex: Use case-sensitive comparison in PLATFORM_ID.Stephen Kelly2013-12-191-1/+1
| | | |
| * | | Genex: Always return immediately on error.Stephen Kelly2013-12-191-0/+4
| | | |
| * | | Export: Clean up comment.Stephen Kelly2013-12-191-2/+0
| | | | | | | | | | | | | | | | | | | | Introduced in commit a4263c9f (export(): Handle multiple dependent export sets., 2013-10-10)
| * | | Genex: Accept arbitrary content in *_CASE and MAKE_C_IDENTIFIER.Stephen Kelly2013-12-193-6/+12
| | | |
| * | | Genex: Allow single param expressions to accept arbirary input.Stephen Kelly2013-12-191-31/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | Constify cmStrCmp.Stephen Kelly2013-12-191-3/+3
| | | |
| * | | Help: Fix CMP0037 docs.Stephen Kelly2013-12-191-1/+1
| | | | | | | | | | | | | | | | | | | | INTERFACE libraries may not use double-colons, but IMPORTED targets may.
| * | | Help: Add missing period.Stephen Kelly2013-12-191-1/+1
| |/ /
* | | Merge topic 'add-platform-MirBSD'Brad King2013-12-201-0/+1
|\ \ \ | | | | | | | | | | | | | | | | af7489d Add MirBSD platform support (#14659)
| * | | Add MirBSD platform support (#14659)Brad King2013-12-191-0/+1
| |/ / | | | | | | | | | | | | Add a Modules/Platform/MirBSD.cmake module that just includes the OpenBSD platform module.
* | | Merge topic 'make-entry-no-parallel'Brad King2013-12-204-0/+18
|\ \ \ | | | | | | | | | | | | | | | | bd11de0 Makefile: Allow "gmake target1 target2 -j" (#14312)
| * | | Makefile: Allow "gmake target1 target2 -j" (#14312)Brad King2013-12-204-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | Merge topic 'update-kwsys'Brad King2013-12-206-9/+44
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 2a943d9 Merge branch 'upstream-kwsys' into update-kwsys f788d9a KWSys 2013-12-19 (88165c5e)
| * \ \ \ Merge branch 'upstream-kwsys' into update-kwsysBrad King2013-12-196-9/+44
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | KWSys 2013-12-19 (88165c5e)KWSys Robot2013-12-196-9/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | Merge topic 'doc-TestCXXAcceptsFlag-cleanup'Brad King2013-12-201-7/+9
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 95c705a TestCXXAcceptsFlag: Update documentation (#14657)
| * | | | | TestCXXAcceptsFlag: Update documentation (#14657)Brad King2013-12-191-7/+9
| |/ / / / | | | | | | | | | | | | | | | | | | | | Document this module as deprecated and link to CheckCXXCompilerFlag. Fix cut-n-paste-o and format macro signature.
* | | | | Merge topic 'find_backtrace'Brad King2013-12-201-7/+10
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | 9650c09 FindBacktrace: Search and report only when not already found
| * | | | FindBacktrace: Search and report only when not already foundVadim Zhukov2013-12-191-7/+10
| | |_|/ | |/| | | | | | | | | | | | | | | | | | Avoid saying "... detected in default set..." each time CMake is run. Prompted by Rolf Eike Beer on cmake-developers@.
* | | | CMake Nightly Date StampKitware Robot2013-12-201-1/+1
| |/ / |/| |
* | | Merge topic 'doc-clarify-if-TARGET'Brad King2013-12-191-208/+170
|\ \ \ | | | | | | | | | | | | | | | | | | | | 6b8662e Help: Clarify if(TARGET) behavior (#14646) b74819e Help: Format 'if' command documentation
| * | | Help: Clarify if(TARGET) behavior (#14646)Brad King2013-12-181-1/+3
| | | | | | | | | | | | | | | | | | | | Define the meaning of a "target" clearly and link to the commands that create them.
| * | | Help: Format 'if' command documentationBrad King2013-12-181-207/+167
| |/ / | | | | | | | | | | | | | | | | | | 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.
* | | Merge topic 'wix-fragment-injection'Brad King2013-12-198-0/+366
|\ \ \ | | | | | | | | | | | | | | | | 8632233 CPackWiX: allow customization of generated WiX sources
| * | | CPackWiX: allow customization of generated WiX sourcesNils Gladitz2013-12-178-0/+366
| | | | | | | | | | | | | | | | | | | | | | | | 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).
* | | | Merge topic 'GenerateExportHeader-tests'Brad King2013-12-1931-326/+595
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 2410b91 Merge some GenerateExportHeader subtests. 4017db1 Speed up the GenerateExportHeader unit test (#14453).
| * | | | Merge some GenerateExportHeader subtests.Stephen Kelly2013-12-1515-143/+28
| | | | |
| * | | | Speed up the GenerateExportHeader unit test (#14453).Stephen Kelly2013-12-1517-183/+567
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of running many small tests with many cmake projects, simply compare the generated export header against a reference. Remove the helper macros and the try_compiles which are duplicates of the library build tests.
* | | | | Merge topic 'build-symlink-invalid-sup-file'Brad King2013-12-191-1/+9
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 57c008c Tests: allow valgrind test to pass with symlinked build dir
| * | | | | Tests: allow valgrind test to pass with symlinked build dirNils Gladitz2013-12-141-1/+9
| | | | | |
* | | | | | Merge topic 'minor-cleanup'Brad King2013-12-193-3/+17
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e2cb3e7 Help: Note that COMPATIBLE_INTERFACE_ properties may be origin-debugged. 41e48c4 Avoid certain actions on IMPORTED targets.
| * | | | | | Help: Note that COMPATIBLE_INTERFACE_ properties may be origin-debugged.Stephen Kelly2013-12-131-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Link to other properties mentioned in the docs already.
| * | | | | | Avoid certain actions on IMPORTED targets.Stephen Kelly2013-12-112-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As we're iterating over IMPORTED targets now, handle them in the loop body. The existing behavior is harmless because generally nothing is done anyway for IMPORTED targets in these code paths, because they do not have sources for example.
* | | | | | | Merge topic 'Qt4-NO_DEBUG-define'Brad King2013-12-192-0/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3e97bcb Use a config-specific moc parameters file, if needed. b9f0d81 Define QT_NO_DEBUG for non-debug use of Qt 4.
| * | | | | | | Use a config-specific moc parameters file, if needed.Stephen Kelly2013-12-121-0/+1
| | | | | | | |
| * | | | | | | Define QT_NO_DEBUG for non-debug use of Qt 4.Stephen Kelly2013-12-101-0/+4
| | | | | | | |
* | | | | | | | Merge topic 'constify'Brad King2013-12-1936-180/+226
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | | | Constify autogen handling.Stephen Kelly2013-12-113-15/+18
| | | | | | | | |
| * | | | | | | | Autogen: Split AutoRcc handling into two methodsStephen Kelly2013-12-112-20/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The initialize method changes the target, whereas the setup method does not.
| * | | | | | | | cmLocalGenerator: Constify target definitions accessStephen Kelly2013-12-112-3/+4
| | | | | | | | |
| * | | | | | | | Constify cmGeneratorTarget access.Stephen Kelly2013-12-113-3/+4
| | | | | | | | |
| * | | | | | | | Constify handling of link targets.Stephen Kelly2013-12-118-34/+41
| | | | | | | | |