Commit Graph

28535 Commits

Author SHA1 Message Date
Brad King 02c4aa1f97 Merge topic 'FindMatlab-fix-visibility-and-reconfiguration'
8444809c FindMatlab: fix reconfiguration of Matlab_ROOT_DIR
5752e558 FindMatlab: fix header visibility of the generated mex files
221a0263 FindMatlab: Drop incorrect usage option from test helper script
2015-06-01 09:37:32 -04:00
Brad King 40bad51490 Merge topic 'doc-add_dependencies-no-install'
9504d7a9 Help: Explicitly mention lack of 'install' support in add_dependencies
2015-06-01 09:37:31 -04:00
Brad King f663e9d0a0 Merge topic 'doc-cmake-compile-features-typo'
a9b1838f Help: Fix typo in cmake-compile-features(7) manual (#15594)
2015-06-01 09:37:29 -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
Raffi Enficiaud 8444809c47 FindMatlab: fix reconfiguration of Matlab_ROOT_DIR 2015-06-01 09:24:06 -04:00
Raffi Enficiaud 5752e55805 FindMatlab: fix header visibility of the generated mex files 2015-06-01 09:24:06 -04:00
Raffi Enficiaud 221a02635e FindMatlab: Drop incorrect usage option from test helper script
There is no 'working_directory' option.
2015-06-01 09:23:54 -04:00
Brad King 9504d7a99b Help: Explicitly mention lack of 'install' support in add_dependencies
CMake-generated targets are not supported by add_dependencies.  State
this explicitly and use 'install' as an example since this may be
commonly attempted.
2015-06-01 09:13:23 -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
Daniele E. Domenichelli d4c6531a94 FindPkgConfig: Fix extra paths for CMAKE_{FRAMEWORK,APPBUNDLE}_PATH vars
The CMAKE_FRAMEWORK_PATH and CMAKE_APPBUNDLE_PATH cache variables are
supposed to be used to generate the extra paths passed to pkg-config,
but instead the CMAKE_PREFIX_PATH variable is used.

This bug was introduced by the refactor in commit v3.1.0-rc1~747^2~1.
2015-05-29 19:22:57 +02:00
Erik Sjölund a9b1838f97 Help: Fix typo in cmake-compile-features(7) manual (#15594)
target_link_libraries() is being used in the example code but
target_include_directories() was probably meant to be used. The sentence
that starts with "Consuming code then" indicates that the example is
about using the appropriate include directory.
2015-05-29 11:23:37 -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 ec12336f15 Merge branch 'release' 2015-05-28 09:59:00 -04:00
Brad King e2bb333fac Merge branch 'release-3.1' 2015-05-28 09:57:44 -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
KWSys Robot ee71b75133 KWSys 2015-05-27 (61e0419f)
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
2015-05-28 08:21:52 -04:00
Kitware Robot 2d4bef07d9 CMake Nightly Date Stamp 2015-05-28 00:01:11 -04:00
Brad King 827afc8db2 Merge branch 'ctest-update-gmake-error-match' into release-3.1 2015-05-27 11:57:51 -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 76b92412be Merge topic 'test-genex-TARGET_FILE-on-INTERFACE'
89253992 Tests: Add case for rejecting $<TARGET_FILE:...> on an INTERFACE library
2015-05-27 09:23:06 -04:00
Brad King 337f9b842e Merge topic 'intel-fortran-windows-debug'
bd2ef44b Intel: Disable Fortran optimizations for Debug config on Windows (#15583)
2015-05-27 09:23:05 -04:00
Brad King d31f6290f1 Merge topic 'hpux-isfinite'
9217b678 jsoncpp: Provide 'isfinite' impl on more HP-UX versions (#15576)
2015-05-27 09:23:03 -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
Brad King 89253992b8 Tests: Add case for rejecting $<TARGET_FILE:...> on an INTERFACE library
Add an explicit test for this existing error.  We already cover it for
an OBJECT library but INTERFACE libraries are not allowed either.
2015-05-26 11:53:36 -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