summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'vs-nsight-tegra-min-api'Brad King2014-12-189-2/+30
|\ | | | | | | | | eeaa25e5 Add 'ANDROID_API_MIN' target property to set Android Target MIN API
| * Add 'ANDROID_API_MIN' target property to set Android Target MIN APIDmitry Polyanitsa2014-12-179-2/+30
| | | | | | | | | | | | Also add a 'CMAKE_ANDROID_API_MIN' variable to set the property default. Teach the VS generator to write the MIN API value into Nsight Tegra project files.
* | Merge topic 'fix-sha2-cast-constness'Brad King2014-12-181-12/+12
|\ \ | | | | | | | | | | | | d4d2d72f sha2: Fix -Wcast-qual warnings by adding const to some casts
| * | sha2: Fix -Wcast-qual warnings by adding const to some castsSean McBride2014-12-171-12/+12
| | |
* | | Merge topic 'doc-INTERFACE-target-type'Brad King2014-12-181-1/+2
|\ \ \ | | | | | | | | | | | | | | | | 473446ab Help: Add INTERFACE_LIBRARY to TYPE target property documentation
| * | | Help: Add INTERFACE_LIBRARY to TYPE target property documentationTim Blechmann2014-12-171-1/+2
| | | |
* | | | Merge topic 'test-memcheck-with-RunCMake'Brad King2014-12-1876-301/+354
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 7ca6bdf0 Tests: Move CTestTestMemcheck tools into Tests/CMakeLib 1651dc96 Tests: Move CTestTestMemcheck cases into a RunCMake.CTestMemcheck test
| * | | | Tests: Move CTestTestMemcheck tools into Tests/CMakeLibBrad King2014-12-185-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The dummy memcheck tools we build for the RunCMake.CTestMemcheck tests require CMakeLib, so put them in a Tests/CMakeLib/PseudoMemcheck directory.
| * | | | Tests: Move CTestTestMemcheck cases into a RunCMake.CTestMemcheck testBrad King2014-12-1871-256/+311
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The CTestTestMemcheck test cases all try to check the ctest output with a regular expression. They fail intermittently due to ordering of the portions of the output that come from stdout and stderr being mixed. Convert all the test cases to use the RunCMake infrastructure to match stdout and stderr separately.
* | | | | Merge topic 'curl-darwinssl'Brad King2014-12-182-0/+28
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | e4563257 curl: Use OS X SSL/TLS native implementation
| * | | | | curl: Use OS X SSL/TLS native implementationBrad King2014-12-182-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On OS X, when CMAKE_USE_OPENSSL is OFF, use the OS implementation. This will allow the OS-configured CA list to be trusted automatically. This is supported on OS X 10.6 and above using AppleClang, Clang, and GNU compilers.
* | | | | | CMake Nightly Date StampKitware Robot2014-12-181-1/+1
| | | | | |
* | | | | | 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