summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | Merge topic 'file-log-less-data'Brad King2015-06-011-20/+31
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | cmFileCommand: Do not log raw protocol data from curl (#15589)Brad King2015-05-281-3/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | | | cmFileCommand: Clarify logic for populating LOG variableBrad King2015-05-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | | | cmFileCommand: Rename variable verboseLog => logVarBrad King2015-05-281-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes the LOG variable name consistent between UPLOAD and DOWNLOAD implementations.
| * | | | | | | | cmFileCommand: Remove leftover no-op debugging logicBrad King2015-05-281-11/+0
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | | Merge topic 'update-kwsys'Brad King2015-06-013-14/+51
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bf365792 Merge branch 'upstream-kwsys' into update-kwsys ee71b751 KWSys 2015-05-27 (61e0419f)
| * \ \ \ \ \ \ \ Merge branch 'upstream-kwsys' into update-kwsysBrad King2015-05-283-14/+51
| |\ \ \ \ \ \ \ \
| | * | | | | | | | KWSys 2015-05-27 (61e0419f)KWSys Robot2015-05-283-14/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract upstream KWSys using the following shell commands. $ git archive --prefix=upstream-kwsys/ 61e0419f | tar x $ git shortlog --no-merges --abbrev=8 --format='%h %s' b1d560a0..61e0419f Brad King (1): 61e0419f SystemTools: Teach RemoveFile to tolerate missing file Matt McCormick (1): 9a6b7c3f cmake: Set CMP0056 to NEW
* | | | | | | | | | CMake Nightly Date StampKitware Robot2015-06-011-1/+1
| | | | | | | | | |
* | | | | | | | | | CMake Nightly Date StampKitware Robot2015-05-311-1/+1
| | | | | | | | | |
* | | | | | | | | | CMake Nightly Date StampKitware Robot2015-05-301-1/+1
| |_|_|/ / / / / / |/| | | | | | | |
* | | | | | | | | CMake Nightly Date StampKitware Robot2015-05-291-1/+1
| |_|/ / / / / / |/| | | | | | |
* | | | | | | | Merge branch 'release'Brad King2015-05-280-0/+0
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | Merge branch 'ctest-update-gmake-error-match' into releaseBrad King2015-05-271-2/+2
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'fix-function-missing-endforeach' into releaseBrad King2015-05-189-1/+34
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'InstallRequiredSystemLibraries-vs2015' into releaseBrad King2015-05-041-2/+10
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'mingw32-make-backslash-workaround' into releaseBrad King2015-05-012-0/+11
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / | | |/| | | | | | | |
* | | | | | | | | | | Merge branch 'release-3.1'Brad King2015-05-280-0/+0
|\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'ctest-update-gmake-error-match' into release-3.1Brad King2015-05-271-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / | | |/| | | | | | | | |
* | | | | | | | | | | | Merge topic 'ctest-xml-refactor'Brad King2015-05-2826-714/+919
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | | | | cmCTest: Drop unused method overloadsDaniel Pfeifer2015-05-262-115/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | | | | | | | cmCTest{Test,MemCheck}Handler: Port to cmXMLWriterDaniel Pfeifer2015-05-264-224/+202
| | | | | | | | | | | | |
| * | | | | | | | | | | | cmCTestCoverageHandler: Port to cmXMLWriterDaniel Pfeifer2015-05-262-158/+153
| | | | | | | | | | | | |
| * | | | | | | | | | | | cmCTestBuildHandler: Port to cmXMLWriterDaniel Pfeifer2015-05-262-63/+46
| | | | | | | | | | | | |
| * | | | | | | | | | | | cmCTestLaunch: Port to cmXMLWriterDaniel Pfeifer2015-05-262-74/+61
| | | | | | | | | | | | |
| * | | | | | | | | | | | cmCTest: Port GenerateNotesFile to cmXMLWriterDaniel Pfeifer2015-05-262-25/+27
| | | | | | | | | | | | |
| * | | | | | | | | | | | cmCTestConfigureHandler: Port to cmXMLWriterDaniel Pfeifer2015-05-261-22/+16
| | | | | | | | | | | | |
| * | | | | | | | | | | | cmCTestUploadHandler: Port to cmXMLWriterDaniel Pfeifer2015-05-261-21/+25
| | | | | | | | | | | | |
| * | | | | | | | | | | | cmCTestUpdateHandler: Port to cmXMLWriterDaniel Pfeifer2015-05-269-78/+78
| | | | | | | | | | | | |
| * | | | | | | | | | | | cmCTest: Port to cmXMLWriterDaniel Pfeifer2015-05-262-0/+121
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Re-implement StartXML, EndXML, and AddSiteProperties using cmXMLWriter. Leave the old overloads behind for use by CTest/* until they are ported.
| * | | | | | | | | | | | Add cmXMLWriter class to consolidate XML generationDaniel Pfeifer2015-05-263-0/+256
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Explicitly track XML generation state (indentation, element closure, etc.) so that clients can avoid manually/implicitly maintaining it.
* | | | | | | | | | | | | Merge topic 'ctest-xml-minor-cleanup'Brad King2015-05-284-15/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b26e5b55 CTest: Generate NamedMeasurement elements directly into xml file 965cf8e6 CTest: Drop stray content from Configure.xml
| * | | | | | | | | | | | CTest: Generate NamedMeasurement elements directly into xml fileDaniel Pfeifer2015-05-263-10/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Re-order the logic to avoid use of a temporary std::ostringstream.
| * | | | | | | | | | | | CTest: Drop stray content from Configure.xmlDaniel Pfeifer2015-05-261-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove content left accidentally since commit v2.4.0~2876 (some bug fixes for my recent checkins and some more cleanup, 2004-09-07).
* | | | | | | | | | | | | Merge topic 'ctest-update-gmake-error-match'Brad King2015-05-281-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / | |/| | | | | | / / / / / | |_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | 44a4e545 ctest_build: Fix regression in GNU make error message matching
| * | | | | | | | | | | ctest_build: Fix regression in GNU make error message matchingZack Galbreath2015-05-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | | | | | | CMake Nightly Date StampKitware Robot2015-05-281-1/+1
| | | | | | | | | | | |
* | | | | | | | | | | | Merge topic 'test-genex-TARGET_FILE-on-INTERFACE'Brad King2015-05-274-0/+34
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 89253992 Tests: Add case for rejecting $<TARGET_FILE:...> on an INTERFACE library
| * | | | | | | | | | | | Tests: Add case for rejecting $<TARGET_FILE:...> on an INTERFACE libraryBrad King2015-05-264-0/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add an explicit test for this existing error. We already cover it for an OBJECT library but INTERFACE libraries are not allowed either.
* | | | | | | | | | | | | Merge topic 'intel-fortran-windows-debug'Brad King2015-05-271-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bd2ef44b Intel: Disable Fortran optimizations for Debug config on Windows (#15583)
| * | | | | | | | | | | | | Intel: Disable Fortran optimizations for Debug config on Windows (#15583)Brad King2015-05-261-1/+1
| |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The "/Od" flag is used for C and C++ languages in this configuration so we should use it for Fortran too. Suggested-by: Oleg V. Zhylin <ovz@yahoo.com>
* | | | | | | | | | | | | Merge topic 'hpux-isfinite'Brad King2015-05-271-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9217b678 jsoncpp: Provide 'isfinite' impl on more HP-UX versions (#15576)
| * | | | | | | | | | | | | jsoncpp: Provide 'isfinite' impl on more HP-UX versions (#15576)Michael Scott2015-05-261-1/+6
| |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some versions of HP-UX do not define 'isfinite' or 'finite' in math.h for Itanium when preprocessing with C++, so we have to add the definition ourselves instead to map to the internal version.
* | | | | | | | | | | | | Merge topic 'inject-state-snapshot'Brad King2015-05-2774-274/+390
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | | | | | | | | cmLocalGenerator: Require a valid cmState::Snapshot in the ctor.Stephen Kelly2015-05-2738-64/+111
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | | | | | | | | cmState: Host some state from the cmGlobalGenerator.Stephen Kelly2015-05-2713-42/+113
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | cmGlobalGenerator: Require a cmake instance in ctor.Stephen Kelly2015-05-2752-149/+124
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is required anyway, so this makes it explicit.
| * | | | | | | | | | | | | cmState: Move snapshot creation to the cmake instance.Stephen Kelly2015-05-245-20/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't create a snapshot in Initialize(), but leave the creation responsibility to the cmake instance instead. Previously, the cmState would Initialize() in its constructor, and the cmake instance would re-Initialize() during Configure(). The end result was the same and there would be one snapshot present. However, cmLocalGenerator also created a snapshot on construction, and that one was used, leaving the first snapshot unused, and potential for off-by-one errors. Fix that by making the cmLocalGenerator use the existing snapshot if it is top-level. Add a CurrentSnapshot to the cmake instance and populated it while configuring a directory. This will eventually replace the 'current local generator' concept. Fix the GetParent implementation to be able to return the first snapshot.
* | | | | | | | | | | | | | Merge topic 'clean-up-GHS'Brad King2015-05-273-44/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | | | | | | | | GHS: Remove call to SetCurrentLocalGenerator.Stephen Kelly2015-05-241-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is not needed as cmLocalGenerator::Configure does this.