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

18395 Commits

Author SHA1 Message Date
Stephen Kelly b68f2ea8ae cmMakefile: Add API for elseif to create backtrace. 2015-06-03 01:03:58 +02:00
Stephen Kelly 17e13f0a2d cmMakefile: Simplify CMP0000 handling. 2015-06-03 01:03:57 +02:00
Brad King d3bb5da929 Begin post-3.3 development 2015-06-02 11:19:44 -04:00
Brad King c2cb80cbfa CMake 3.3.0-rc1 version update 2015-06-02 11:14:25 -04:00
Kitware Robot d9f630a171 CMake Nightly Date Stamp 2015-06-02 00:01:09 -04:00
Brad King fe168ea4d2 Merge topic 'mingw32-make-backslash-workaround' 
7dd4a12c Revert "Makefile: Fix compilation after parent commit was backported"
 2015-06-01 11:34:14 -04:00
Brad King 7dd4a12c30 Revert "Makefile: Fix compilation after parent commit was backported" 
This reverts commit bfa57c5f80.
This change should not be part of 'master', only in 'release'
for CMake 3.2.
 2015-06-01 11:33:24 -04:00
Brad King 05845ac10f Merge branch 'release' 2015-06-01 11:09:28 -04:00
Brad King 1d2ae2b307 Merge branch 'mingw32-make-backslash-workaround' into release 2015-06-01 11:07:57 -04:00
Brad King bfa57c5f80 Makefile: Fix compilation after parent commit was backported 
The CMake 3.2 release branch does not have 'cmAlgorithms.h' and simply
provides 'cmHasLiteralSuffix' in 'cmStandardIncludes.h' instead.
 2015-06-01 11:07:05 -04:00
Brad King 1992aaa96e Merge topic 'file-log-less-data' 
eba12a43 cmFileCommand: Do not log raw protocol data from curl (#15589)
7e10f169 cmFileCommand: Clarify logic for populating LOG variable
0d37dcd3 cmFileCommand: Rename variable verboseLog => logVar
43c01e07 cmFileCommand: Remove leftover no-op debugging logic
 2015-06-01 09:37:24 -04:00
Brad King 8247186281 Merge topic 'update-kwsys' 
bf365792 Merge branch 'upstream-kwsys' into update-kwsys
ee71b751 KWSys 2015-05-27 (61e0419f)
 2015-06-01 09:37:22 -04:00
Kitware Robot d617dc6af4 CMake Nightly Date Stamp 2015-06-01 00:01:06 -04:00
Kitware Robot ab756293bf CMake Nightly Date Stamp 2015-05-31 00:01:05 -04:00
Kitware Robot fc01247f31 CMake Nightly Date Stamp 2015-05-30 00:01:06 -04:00
Kitware Robot 49959d7a23 CMake Nightly Date Stamp 2015-05-29 00:01:08 -04:00
Brad King eba12a4361 cmFileCommand: Do not log raw protocol data from curl (#15589) 
Teach cmFileCommandCurlDebugCallback to filter the debug data by type
and show only summary information instead of the raw data.  This avoids
allocating memory for all data transferred by UPLOAD or DOWNLOAD.
 2015-05-28 11:11:28 -04:00
Brad King 7e10f1691f cmFileCommand: Clarify logic for populating LOG variable 
The chunkDebug buffer we use to accumulate the LOG variable content
is populated if and only if a log variable was requested by the call,
but it is much clearer to check that a log variable was requested
explicitly before populating it.
 2015-05-28 10:37:28 -04:00
Brad King 0d37dcd335 cmFileCommand: Rename variable verboseLog => logVar 
This makes the LOG variable name consistent between UPLOAD and DOWNLOAD
implementations.
 2015-05-28 10:33:44 -04:00
Brad King 43c01e0750 cmFileCommand: Remove leftover no-op debugging logic 
Remove debugging logic left from commit v2.6.0~305 (add DOWNLOAD option
to FILE command, 2008-02-06).  The CURLE_OPERATION_TIMEOUTED code path
does nothing that the code immediately after it does not do.
 2015-05-28 10:16:37 -04:00
Brad King 0c24c2311b Merge topic 'ctest-xml-refactor' 
de2ef305 cmCTest: Drop unused method overloads
b04500a7 cmCTest{Test,MemCheck}Handler: Port to cmXMLWriter
8fbc509a cmCTestCoverageHandler: Port to cmXMLWriter
82455a9d cmCTestBuildHandler: Port to cmXMLWriter
1dbd86fd cmCTestLaunch: Port to cmXMLWriter
a53bd63e cmCTest: Port GenerateNotesFile to cmXMLWriter
9c0bb7d8 cmCTestConfigureHandler: Port to cmXMLWriter
6cf5cc71 cmCTestUploadHandler: Port to cmXMLWriter
ed42c203 cmCTestUpdateHandler: Port to cmXMLWriter
18825baf cmCTest: Port to cmXMLWriter
f6413400 Add cmXMLWriter class to consolidate XML generation
 2015-05-28 09:56:53 -04:00
Brad King a2312986af Merge topic 'ctest-xml-minor-cleanup' 
b26e5b55 CTest: Generate NamedMeasurement elements directly into xml file
965cf8e6 CTest: Drop stray content from Configure.xml
 2015-05-28 09:56:51 -04:00
Brad King cc55c33ed5 Merge topic 'ctest-update-gmake-error-match' 
44a4e545 ctest_build: Fix regression in GNU make error message matching
 2015-05-28 09:56:49 -04:00
Brad King bf365792a1 Merge branch 'upstream-kwsys' into update-kwsys 2015-05-28 08:21:55 -04:00
Kitware Robot 2d4bef07d9 CMake Nightly Date Stamp 2015-05-28 00:01:11 -04:00
Brad King cf86696ae8 Merge branch 'ctest-update-gmake-error-match' into release 2015-05-27 11:52:20 -04:00
Zack Galbreath 44a4e54547 ctest_build: Fix regression in GNU make error message matching 
The regex update in commit v3.1.2~4^2 (ctest_build: Update GNU make
error message matching, 2015-01-28) broke matching of the messages it
updated.  Remove the escape character before the square brackets added
by that commit.
 2015-05-27 11:48:38 -04:00
Brad King c12fc3573b Merge topic 'inject-state-snapshot' 
3b880a07 cmLocalGenerator: Require a valid cmState::Snapshot in the ctor.
e12afe76 cmState: Host some state from the cmGlobalGenerator.
c7b79aa1 cmGlobalGenerator: Require a cmake instance in ctor.
01e1cd5c cmState: Move snapshot creation to the cmake instance.
 2015-05-27 09:23:01 -04:00
Brad King 94e4b5d2c3 Merge topic 'clean-up-GHS' 
f69dcdfc GHS: Remove call to SetCurrentLocalGenerator.
a4d230af GHS: Don't attempt to generate for IMPORTED or INTERFACE targets.
550e08b0 GHS: Remove unnecessary condition.
d34467cd GHS: Remove unused CustomCommandUseLocal.
9afc9e84 GHS: Remove BuildFileName.
73245e59 GHS: Remove unnecessary Configure override.
 2015-05-27 09:22:59 -04:00
Brad King 95bab020b3 Merge topic 'minor-cleanups' 
f5b0a0fb cmMakefile: Don't pop the directory listfile off the stack.
e40fcb59 cmMakefile: Simplify convert condition.
4fdad392 cmake: Remove redundant forward declaration.
df9635f3 cmake: Remove redundant condition.
ad167479 foreach: Remove unused variables.
aaeec642 cmGlobalGenerator: De-virtualize methods with no overrides.
444bc349 Ninja: Remove some bogus comments.
 2015-05-27 09:22:57 -04:00
Brad King af570e13fd Merge topic 'ninja-per-target-rules' 
9da84ab6 Ninja: Fix regression in .rsp file support
 2015-05-27 09:22:55 -04:00
Stephen Kelly 3b880a0741 cmLocalGenerator: Require a valid cmState::Snapshot in the ctor. 
Refactor the local generator creation API to accept a
cmState::Snapshot.  Adjust MakeLocalGenerator to use the 'current'
snapshot in cases where there is no parent.  Create the snapshot
for subdirectories in cmMakefile::AddSubdirectory.

This means that snapshots are now created at the point of extending the tree,
as appropriate, and independently of the cmLocalGenerator and cmMakefile they
represent the state for.
 2015-05-27 09:18:32 -04:00
Stephen Kelly e12afe766e cmState: Host some state from the cmGlobalGenerator. 2015-05-27 09:18:31 -04:00
Stephen Kelly c7b79aa16a cmGlobalGenerator: Require a cmake instance in ctor. 
It is required anyway, so this makes it explicit.
 2015-05-27 09:18:31 -04:00
Kitware Robot fcafd0cfc6 CMake Nightly Date Stamp 2015-05-27 00:01:07 -04:00
Daniel Pfeifer de2ef3053c cmCTest: Drop unused method overloads 
The StartXML, EndXML, and AddSiteProperties overloads that take a stream
directly are no longer called anywhere.  All clients hvae been ported to
cmXMLWriter.  Drop the old overloads.
 2015-05-26 11:09:22 -04:00
Daniel Pfeifer b04500a725 cmCTest{Test,MemCheck}Handler: Port to cmXMLWriter 2015-05-26 11:09:22 -04:00
Daniel Pfeifer 8fbc509a48 cmCTestCoverageHandler: Port to cmXMLWriter 2015-05-26 11:09:22 -04:00
Daniel Pfeifer 82455a9d3a cmCTestBuildHandler: Port to cmXMLWriter 2015-05-26 11:09:22 -04:00
Daniel Pfeifer 1dbd86fd6d cmCTestLaunch: Port to cmXMLWriter 2015-05-26 11:09:21 -04:00
Daniel Pfeifer a53bd63e0c cmCTest: Port GenerateNotesFile to cmXMLWriter 2015-05-26 11:09:21 -04:00
Daniel Pfeifer 9c0bb7d807 cmCTestConfigureHandler: Port to cmXMLWriter 2015-05-26 11:09:21 -04:00
Daniel Pfeifer 6cf5cc717f cmCTestUploadHandler: Port to cmXMLWriter 2015-05-26 11:09:21 -04:00
Daniel Pfeifer ed42c203ed cmCTestUpdateHandler: Port to cmXMLWriter 2015-05-26 11:09:21 -04:00
Daniel Pfeifer 18825bafd9 cmCTest: Port to cmXMLWriter 
Re-implement StartXML, EndXML, and AddSiteProperties using cmXMLWriter.
Leave the old overloads behind for use by CTest/* until they are ported.
 2015-05-26 11:09:20 -04:00
Daniel Pfeifer f6413400a0 Add cmXMLWriter class to consolidate XML generation 
Explicitly track XML generation state (indentation, element closure,
etc.) so that clients can avoid manually/implicitly maintaining it.
 2015-05-26 11:09:20 -04:00
Daniel Pfeifer b26e5b552a CTest: Generate NamedMeasurement elements directly into xml file 
Re-order the logic to avoid use of a temporary std::ostringstream.
 2015-05-26 10:40:00 -04:00
Daniel Pfeifer 965cf8e66e CTest: Drop stray content from Configure.xml 
Remove content left accidentally since commit v2.4.0~2876 (some bug
fixes for my recent checkins and some more cleanup, 2004-09-07).
 2015-05-26 10:39:45 -04:00
Brad King 12b9005d7c Merge topic 'extend-visibility-properties' 
700f1c3b Honor visibility properties for all target types (#15556)
50de5dbb Help: Format visibility property and variable documentation
771f1b00 Tests: Rename Visibility{InlinesHidden =>}
ab55b3b5 Tests: Refactor RunCMake.VisibilityPreset test setup
 2015-05-26 09:24:00 -04:00
Brad King 3638641396 Merge topic 'run-include-what-you-use' 
b3475ba5 Makefile: Fix <LANG>_INCLUDE_WHAT_YOU_USE with CTEST_USE_LAUNCHERS
 2015-05-26 09:23:54 -04:00