summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'upstream-kwsys' into update-kwsysBrad King2014-12-174-15/+58
|\
| * KWSys 2014-12-16 (cc4046a8)KWSys Robot2014-12-174-15/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract upstream KWSys using the following shell commands. $ git archive --prefix=upstream-kwsys/ cc4046a8 | tar x $ git shortlog --no-merges --abbrev=8 --format='%h %s' dec9c30b..cc4046a8 Brad King (2): 9c3eacf8 Add CONTRIBUTING.rst file with instructions to contribute cc4046a8 Directory: Work around PGI problem with Linux Large File Support Jean-Christophe Fillion-Robin (2): c38ba638 SystemInformation: Improve Get(Available/Total)VirtualMemory for windows 58308145 SystemInformation: Improve comments in private implementation Change-Id: Ic033444a9c03a8a8b5195e7dac108af2aec79fa6
* | Merge topic 'ctest_memcheck-no-empty-BC-output'Brad King2014-12-171-0/+4
|\ \ | | | | | | | | | | | | 1c812979 ctest_memcheck: Do not open empty BC output file name
| * | ctest_memcheck: Do not open empty BC output file nameBrad King2014-12-161-0/+4
| | | | | | | | | | | | | | | | | | In cmCTestMemCheckHandler::PostProcessBoundsCheckerTest return early if the output file name is empty. We already do this in the similar cmCTestMemCheckHandler::AppendMemTesterOutput method.
* | | Merge topic 'test-RunCMake-updates'Brad King2014-12-172-4/+4
|\ \ \ | |/ / | | | | | | | | | | | | | | | 29533380 Tests: Allow RunCMake expected result code to be a regex a85ee8b8 Tests: Simplify RunCMake test extra argument passing da7155f5 Tests: Allow RunCMake tests to pass generator expressions
| * | Tests: Allow RunCMake expected result code to be a regexBrad King2014-12-161-1/+1
| | | | | | | | | | | | | | | This will allow the '-result.txt' files to specify a regex matching different results on different platforms.
| * | Tests: Simplify RunCMake test extra argument passingBrad King2014-12-151-2/+2
| | | | | | | | | | | | | | | Allow add_RunCMake_test calls to pass non-optional arguments immediately.
| * | Tests: Allow RunCMake tests to pass generator expressionsBrad King2014-12-151-1/+1
| | |
* | | Merge topic 'fix_coverage_scanbuild_errors'Brad King2014-12-172-4/+0
|\ \ \ | | | | | | | | | | | | | | | | 0622f92d CTest: Remove code to fix scanbuild errors
| * | | CTest: Remove code to fix scanbuild errorsJoseph Snyder2014-12-152-4/+0
| |/ / | | | | | | | | | | | | | | | Remove code from cmParseBlanketJSCoverage.cxx and cmParseDelphiCoverage.cxx which caused scanbuild errors about not reading the value that was stored.
* | | Merge topic 'test-CheckSourceTree-update'Brad King2014-12-171-2/+2
|\ \ \ | | | | | | | | | | | | | | | | 2a3e2631 Tests: Fix CheckSourceTree test for newer Git
| * | | Tests: Fix CheckSourceTree test for newer GitBrad King2014-12-161-2/+2
| | | | | | | | | | | | | | | | | | | | The output of 'git status' no longer starts each line in '#'. Match that optionally.
* | | | Merge topic 'doc-custom-command-depends'Brad King2014-12-172-1/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 953d34fd Help: Document MAIN_DEPENDENCY limitation in add_custom_command 9859042c Help: Mention add_dependencies in add_custom_target DEPENDS option
| * | | | Help: Document MAIN_DEPENDENCY limitation in add_custom_commandBrad King2014-12-161-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Specify explicitly that at most one custom command may use a given source file as its main dependency.
| * | | | Help: Mention add_dependencies in add_custom_target DEPENDS optionBrad King2014-12-161-0/+3
| | |/ / | |/| | | | | | | | | | This will direct readers looking to add target-level dependencies.
* | | | Merge branch 'release'Brad King2014-12-170-0/+0
|\ \ \ \
| * | | | CMake 3.1.0v3.1.0Brad King2014-12-151-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2014-12-171-1/+1
| |_|/ / |/| | |
* | | | CMake Nightly Date StampKitware Robot2014-12-161-1/+1
| |/ / |/| |
* | | Merge topic 'cmp0054-warnings-extproj'Brad King2014-12-151-2/+2
|\ \ \ | | | | | | | | | | | | | | | | a300d0ff ExternalProject: avoid CMP0054 warnings
| * | | ExternalProject: avoid CMP0054 warningsBen Boeckel2014-12-121-2/+2
| | | | | | | | | | | | | | | | Found where ${command} is "make" which is a local variable.
* | | | Merge topic 'extproj-extra-newlines'Brad King2014-12-151-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 480e6029 ExternalProject: remove extra newlines from log messages
| * | | | ExternalProject: remove extra newlines from log messagesBen Boeckel2014-12-121-2/+2
| |/ / / | | | | | | | | | | | | message() already adds a newline.
* | | | Merge topic 'tests-osx-version'Brad King2014-12-151-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | f53a3340 Tests: Fix OS X version check to use component-wise test
| * | | | Tests: Fix OS X version check to use component-wise testBrad King2014-12-121-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Otherwise 10.10 may be considered to be less than 10.4 and the tests for CPack will not run. Reported-by: Sean McBride <sean@rogue-research.com>
* | | | Merge topic 'assert-no-string-conversion'Brad King2014-12-155-12/+12
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 2e92570b Fix some Clang -Wstring-conversion warnings
| * | | | Fix some Clang -Wstring-conversion warningsSean McBride2014-12-125-12/+12
| |/ / / | | | | | | | | | | | | | | | | Some false positives, but some flagged faulty asserts where the ! was inside the string instead of outside.
* | | | Merge topic 'curl-winssl'Brad King2014-12-152-1/+14
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | ba8c6632 curl: Use Windows SSL/TLS native implementation
| * | | | curl: Use Windows SSL/TLS native implementationBrad King2014-12-122-1/+14
| |/ / / | | | | | | | | | | | | | | | | On Windows, when CMAKE_USE_OPENSSL is OFF, use the OS implementation. This will allow the OS-configured CA list to be trusted automatically.
* | | | Merge topic 'suncc-fixes'Brad King2014-12-152-8/+12
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 97b65f81 Misc. fixes for the Oracle / Sun compiler.
| * | | | Misc. fixes for the Oracle / Sun compiler.Chuck Atkins2014-12-122-8/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A few pieces of code have some ambiguous type deduction that seems to resolve correctly for most compilers but not for the Oracle compiler. This makes those few instances more explicit.
* | | | | Merge topic 'FindMPI-parse-Xlinker-flags'Brad King2014-12-151-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | a0792c48 FindMPI: Extract -Xlinker options
| * | | | | FindMPI: Extract -Xlinker optionsAlin Marin Elena2014-12-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend the regex that mathces -Wl, linker options to match -Xlinker too. These are used by Intel MPI and perhaps others.
* | | | | | CMake Nightly Date StampKitware Robot2014-12-151-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2014-12-141-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2014-12-131-1/+1
| |_|/ / / |/| | | |
* | | | | Merge branch 'release'Brad King2014-12-120-0/+0
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge branch 'doc-CMP0054-example' into releaseBrad King2014-12-121-3/+31
| |\ \ \ \
| * \ \ \ \ Merge branch 'backport-doc-find-module-no-summary' into releaseBrad King2014-12-091-11/+0
| |\ \ \ \ \
* | \ \ \ \ \ Merge topic 'find-msmpi'Brad King2014-12-121-0/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 17a846ac FindMPI: search for msmpi's mpiexec as well
| * | | | | | | FindMPI: search for msmpi's mpiexec as wellBen Boeckel2014-12-111-0/+1
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge topic 'catch-ctest-errors-better'Brad King2014-12-121-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d8589e64 ctest: count errors from scripts properly
| * | | | | | | ctest: count errors from scripts properlyBen Boeckel2014-12-101-1/+1
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the unlikely event that someone has a billion+ scripts (or some codepath returns negative numbers), we could overflow and make a pile of errors a non-error. This change also allows us to use flags for the error in the future rather than just "something went wrong".
* | | | | | | Merge topic 'FindQt4-fix-major-version-mismatch'Brad King2014-12-121-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 009c1865 FindQt4: Fix handling of QT_VERSION_MAJOR mismatch
| * | | | | | | FindQt4: Fix handling of QT_VERSION_MAJOR mismatchDaniel Scharrer2014-12-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix capitalization of Qt4_FOUND variable when setting it to false in this case. This caused find_package(Qt4) to appear successful when it was not. Note that the legacy QT4_FOUND variable is unconditionally overwritten at the end of the file with the value of Qt4_FOUND.
* | | | | | | | Merge topic 'drop-double-underscores'Brad King2014-12-1223-60/+60
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 111be180 Rename header guards to not start with double underscore
| * | | | | | | | Rename header guards to not start with double underscoreSean McBride2014-12-1123-60/+60
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use regex to find/replace: __(cm.*_h) \1 Then fix QCMake.h by hand.
* | | | | | | | Merge topic 'doc-CMP0054-example'Brad King2014-12-121-3/+31
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | f2f1c95d Help: Extend policy CMP0054 documentation with an example
| * | | | | | | Help: Extend policy CMP0054 documentation with an exampleNils Gladitz2014-12-121-3/+31
| | |_|_|/ / / | |/| | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2014-12-121-1/+1
| |/ / / / / |/| | | | |