summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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 '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
| | | | | | | |
| * | | | | | | Constify handling of target dependencies.Stephen Kelly2013-12-1124-105/+122
| | | | | | | |
* | | | | | | | Merge topic 'FindSubversion-TortoiseSVN'Brad King2013-12-191-0/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 62c276f FindSubversion: Use TortoiseSVN registry key to locate svn
| * | | | | | | | FindSubversion: Use TortoiseSVN registry key to locate svnDaniele E. Domenichelli2013-12-111-0/+2
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If TortoiseSVN is not installed in the default path, the svn executable installed by TortoiseSVN is not found. Using the registry key should always find it.
* | | | | | | | Merge topic 'remove-INTERFACE-build-targets'Brad King2013-12-1912-119/+65
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | 97fae68 Remove INTERFACE build targets.
| * | | | | | | Remove INTERFACE build targets.Stephen Kelly2013-12-1012-119/+65
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit b04f3b9a (Create make rules for INTERFACE_LIBRARY targets., 2013-08-21) extended the makefile generator to create build targets for INTERFACE_LIBRARY targets. No other generators were extended with this feature. This conflicts with the feature of whitelisting of target properties read from INTERFACE_LIBRARY targets. The INTERFACE_* properties of the INTERFACE_LIBRARY may legitimately contain TARGET_PROPERTY generator expressions for reading properties from the 'head target'. The 'head target' would be the INTERFACE_LIBRARY itself when creating the build rules for it, which means that non-whitelisted properties would be read.
* | | | | | | Merge topic 'KateFixNinja'Brad King2013-12-192-57/+24
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c3d20c2 kate: fix ninja support 1eaf2f2 kate: remove unused function
| * | | | | | | kate: fix ninja supportAlex Neundorf2013-12-192-11/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ninja needs to be run from the toplevel build dir, not from the target dir, as make Alex
| * | | | | | | kate: remove unused functionAlex Neundorf2013-12-192-46/+0
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | Alex
* | | | | | | Merge topic 'fix-INTERFACE-mapped-config'Brad King2013-12-195-2/+35
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3b8e56a Don't search for IMPORTED_LOCATION of INTERFACE_LIBRARY (14636)
| * | | | | | | Don't search for IMPORTED_LOCATION of INTERFACE_LIBRARY (14636)Stephen Kelly2013-12-095-2/+35
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The INTERFACE_LIBRARY type does not have any LOCATION at all, so return early from GetMappedConfig. GetMappedConfig is called from two locations, one of which already pre-checks the INTERFACE_LIBRARY case. Remove that pre-check and handle that case inside the method instead.
* | | | | | | Merge topic 'libarchive-left-shift-fix'Brad King2013-12-191-20/+48
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0bff4df libarchive: Use ARCHIVE_LITERAL_ULL to add ULL integer suffix 61b39af libarchive: Port upstream issue 320 second fix
| * | | | | | | libarchive: Use ARCHIVE_LITERAL_ULL to add ULL integer suffixBrad King2013-12-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The macro maps to an implementation that works on older compilers when necessary.
| * | | | | | | libarchive: Port upstream issue 320 second fixBrad King2013-12-091-20/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Port upstream commit 6cf33c93 (Issue 320: Rewrite (again) to avoid the left shift that CLang dislikes so much, 2013-12-07) into CMake. Inspired-by: Tim Kientzle <kientzle@freebsd.org>
* | | | | | | | Merge topic 'vtk-contract'Brad King2013-12-191-0/+9
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ad330ed Tests/Contracts: Submit notes with VTK build
| * | | | | | | | Tests/Contracts: Submit notes with VTK buildZack Galbreath2013-12-191-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Submit the configured Dashboard script as as Notes file to CDash. Also add comments about the origin & purpose of this test.
* | | | | | | | | Merge topic 'FindFreetype-2.5'Brad King2013-12-191-3/+13
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | FindFreetype: Remove duplicates in FREETYPE_INCLUDE_DIRSDaniele E. Domenichelli2013-12-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Freetype 2.5 the paths for FREETYPE_INCLUDE_DIR_ft2build and FREETYPE_INCLUDE_DIR_freetype2 are the same
| * | | | | | | | | FindFreetype: Detect version string with Freetype 2.5Daniele E. Domenichelli2013-12-091-2/+8
| | | | | | | | | |
| * | | | | | | | | FindFreetype: Find ftheader.h with Freetype 2.5Daniele E. Domenichelli2013-12-091-1/+4
| | | | | | | | | |
* | | | | | | | | | Merge topic 'xcode-5.1'Brad King2013-12-191-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 65ee85d CMakeDetermineCompilerId: Fix compiler line match for Xcode 5.1
| * | | | | | | | | | CMakeDetermineCompilerId: Fix compiler line match for Xcode 5.1Ted Kremenek2013-12-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Xcode 5.1 output no longer puts "./" in the path to the linker output for the CompilerId test binary. Update our regex to match the path with or without the component.
* | | | | | | | | | | CMake Nightly Date StampKitware Robot2013-12-191-1/+1
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
* | | | | | | | | | CMake Nightly Date StampKitware Robot2013-12-181-1/+1
| | | | | | | | | |
* | | | | | | | | | CMake Nightly Date StampKitware Robot2013-12-171-1/+1
| |_|_|_|_|_|_|_|/ |/| | | | | | | |
* | | | | | | | | CMake Nightly Date StampKitware Robot2013-12-161-1/+1
| | | | | | | | |
* | | | | | | | | CMake Nightly Date StampKitware Robot2013-12-151-1/+1
| |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2013-12-141-1/+1
| | | | | | | |