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

22774 Commits

Author SHA1 Message Date
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
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
Stephen Kelly 2410b912fe Merge some GenerateExportHeader subtests. 2013-12-15 11:22:19 +01:00
Stephen Kelly 4017db13aa Speed up the GenerateExportHeader unit test (#14453). 
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.
 2013-12-15 11:22:19 +01:00
Kitware Robot 5cd2e0fc44 CMake Nightly Date Stamp 2013-12-15 00:01:08 -05:00
Nils Gladitz 57c008c37a Tests: allow valgrind test to pass with symlinked build dir 2013-12-15 00:31:14 +01:00
Kitware Robot c9ca4a7142 CMake Nightly Date Stamp 2013-12-14 00:01:09 -05:00
Stephen Kelly e2cb3e7d43 Help: Note that COMPATIBLE_INTERFACE_ properties may be origin-debugged. 
Link to other properties mentioned in the docs already.
 2013-12-13 14:48:19 +01:00
Kitware Robot 5e43d6d3d0 CMake Nightly Date Stamp 2013-12-13 00:01:07 -05:00
Stephen Kelly 3e97bcb1ef Use a config-specific moc parameters file, if needed. 2013-12-12 18:22:17 +01:00
Kitware Robot edaef237bf CMake Nightly Date Stamp 2013-12-12 00:01:08 -05:00
Stephen Kelly c62cd3e2ae Constify autogen handling. 2013-12-11 15:30:12 +01:00
Stephen Kelly 035b690882 Autogen: Split AutoRcc handling into two methods 
The initialize method changes the target, whereas the setup method
does not.
 2013-12-11 15:30:12 +01:00
Stephen Kelly 2fcafbf613 cmLocalGenerator: Constify target definitions access 2013-12-11 15:30:12 +01:00
Stephen Kelly a54eeddaae Constify cmGeneratorTarget access. 2013-12-11 15:30:11 +01:00
Stephen Kelly 9edee62f28 Constify handling of link targets. 2013-12-11 15:30:11 +01:00
Stephen Kelly ef25ba8d06 Constify handling of target dependencies. 2013-12-11 15:30:11 +01:00
Stephen Kelly 41e48c45e8 Avoid certain actions on IMPORTED targets. 
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.
 2013-12-11 14:23:09 +01:00
Daniele E. Domenichelli 62c276f03e FindSubversion: Use TortoiseSVN registry key to locate svn 
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.
 2013-12-11 13:59:48 +01:00
Kitware Robot 62b90453d7 CMake Nightly Date Stamp 2013-12-11 00:01:08 -05:00
Stephen Kelly b9f0d81c4b Define QT_NO_DEBUG for non-debug use of Qt 4. 2013-12-10 18:33:52 +01:00
Stephen Kelly 97fae68b81 Remove INTERFACE build targets. 
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.
 2013-12-10 17:58:36 +01:00
Kitware Robot a2489ce49c CMake Nightly Date Stamp 2013-12-10 00:01:08 -05:00
Stephen Kelly 3b8e56a50f Don't search for IMPORTED_LOCATION of INTERFACE_LIBRARY (14636) 
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.
 2013-12-09 20:52:52 +01:00
Brad King 0bff4df5f6 libarchive: Use ARCHIVE_LITERAL_ULL to add ULL integer suffix 
The macro maps to an implementation that works on older compilers
when necessary.
 2013-12-09 14:04:24 -05:00