summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'find-msmpi'Brad King2015-01-081-3/+9
|\ | | | | | | | | | | ab4d1d07 FindMPI: MSMPI changed the subdirectories it uses 82724394 FindMPI: add more search paths for MSMPI
| * FindMPI: MSMPI changed the subdirectories it usesBen Boeckel2015-01-061-3/+5
| |
| * FindMPI: add more search paths for MSMPIBen Boeckel2015-01-061-0/+4
| | | | | | | | Also comment what the various search paths are for.
* | Merge topic 'FindIce-CMP0054'Brad King2015-01-081-5/+5
|\ \ | | | | | | | | | | | | cbaf0802 FindIce: Port to work with CMP0054 NEW behavior
| * | FindIce: Port to work with CMP0054 NEW behaviorRolf Eike Beer2015-01-081-5/+5
| | | | | | | | | | | | Do not quote if() arguments meant to test variable definitions.
* | | Merge topic 'FindCUDA-cross'Brad King2015-01-081-2/+2
|\ \ \ | | | | | | | | | | | | | | | | d5846eb1 FindCUDA: Do not assume CMAKE_SYSTEM_PROCESSOR is set
| * | | FindCUDA: Do not assume CMAKE_SYSTEM_PROCESSOR is setMark Abraham2015-01-081-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CMAKE_SYSTEM_PROCESSOR is not guaranteed to be defined (per http://www.cmake.org/Wiki/CMake_Cross_Compiling), and when cross compiling where it happens to be undefined, this module was broken. Reviewed-by: Rolf Eike Beer <eike@sf-mail.de>
* | | | Merge topic 'drop-GNU-2.95'Brad King2015-01-081-21/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | f07d96cc Remove workaround for GCC < 3 ios_base absence. 5a8b9437 Remove GCC 2.95 support macros in favor of template versions.
| * | | | Remove workaround for GCC < 3 ios_base absence.Stephen Kelly2015-01-011-5/+0
| | | | |
| * | | | Remove GCC 2.95 support macros in favor of template versions.Stephen Kelly2015-01-011-16/+0
| | | | | | | | | | | | | | | | | | | | GCC < 3 is no longer supported as a host compiler.
* | | | | Merge topic 'RunCMake-stderr-default'Brad King2015-01-089-4/+17
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 73ae8885 RunCMake: Expect empty output by default.
| * | | | | RunCMake: Expect empty output by default.Stephen Kelly2014-12-319-4/+17
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expect tests to specify stderr content if it is present. Fix the CMP0019 test, which has only been testing the WARN status until now. Specify in the CommandLine and FPHSA tests that content is at least one character. Set policies in the Language and CheckModules tests, which have empty test output, modulo unrelated policies on some platforms.
* | | | | Merge topic 'base64-casts'Brad King2015-01-083-12/+10
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0bdd4ebf cmCTest: Use size_t for cmsysBase64_Encode return value a9fae8ac CTest: Fix integer overflow when uploading huge files
| * | | | | cmCTest: Use size_t for cmsysBase64_Encode return valueBrad King2014-12-263-8/+7
| | | | | |
| * | | | | CTest: Fix integer overflow when uploading huge filesRolf Eike Beer2014-12-261-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When uploading files greater 2GB a cast to 'int' overflows, leading to a bad alloc when passed to new. Also avoid floating point arithmetic when integer calculations will work as well. Reported-by: Justin Borodinsky <justin.borodinsky@gmail.com>
* | | | | | Merge topic 'update-kwsys'Brad King2015-01-082-20/+22
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | 1819d4ad Merge branch 'upstream-kwsys' into update-kwsys 6ed23ff4 KWSys 2014-12-23 (5a15cb3b)
| * | | | | Merge branch 'upstream-kwsys' into update-kwsysBrad King2014-12-232-20/+22
| |\ \ \ \ \
| | * | | | | KWSys 2014-12-23 (5a15cb3b)KWSys Robot2014-12-232-20/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract upstream KWSys using the following shell commands. $ git archive --prefix=upstream-kwsys/ 5a15cb3b | tar x $ git shortlog --no-merges --abbrev=8 --format='%h %s' 87c65319..5a15cb3b Brad King (1): 5a15cb3b Base64: Use size_t for lenghts in API Change-Id: I09a2c5d6b67280f96d580c7b26bf8b2aa0bdb709
* | | | | | | CMake Nightly Date StampKitware Robot2015-01-081-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2015-01-071-1/+1
| |_|_|_|_|/ |/| | | | |
* | | | | | CMake Nightly Date StampKitware Robot2015-01-061-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2015-01-051-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2015-01-041-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2015-01-031-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2015-01-021-1/+1
| | | | | |
* | | | | | Merge topic 'copyright-year'Brad King2015-01-011-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | f881c6ba Copyright.txt: Update year range to end in 2015
| * | | | | | Copyright.txt: Update year range to end in 2015Brad King2015-01-011-1/+1
| | |_|/ / / | |/| | | |
* | | | | | CMake Nightly Date StampKitware Robot2015-01-011-1/+1
|/ / / / /
* | | | | CMake Nightly Date StampKitware Robot2014-12-311-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2014-12-301-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2014-12-291-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2014-12-281-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2014-12-271-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2014-12-261-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2014-12-251-1/+1
| | | | |
* | | | | Merge topic 'sunpro-Fortran-preprocess'Brad King2014-12-241-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | be1109d8 Oracle/Sun: Fix Fortran preprocessor rule generation
| * | | | | Oracle/Sun: Fix Fortran preprocessor rule generationBrad King2014-12-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The SunPro Fortran compiler uses "-F" instead of "-E" to request preprocessing. The output does not go to stdout so use "-o" to specify the output file. This fixes the guess originally made by commit b6b37e30 (Makefile: Add assembly and preprocessed targets for Fortran, 2014-11-05).
* | | | | | Merge topic 'minor-warning-fixes'Brad King2014-12-242-10/+10
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 098fc4a8 cmCMakeMinimumRequired: Use unsigned int for version numbers 1a9ba381 cmParseDelphiCoverage: Remove superfluous semicolons after methods
| * | | | | | cmCMakeMinimumRequired: Use unsigned int for version numbersChristoph GrĂ¼ninger2014-12-231-8/+8
| | | | | | |
| * | | | | | cmParseDelphiCoverage: Remove superfluous semicolons after methodsChristoph GrĂ¼ninger2014-12-231-2/+2
| |/ / / / /
* | | | | | Merge topic 'ninja-fix-subdir-objlib-languages'Brad King2014-12-246-2/+25
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 07fc7b75 Tests: Test using objects from a language enabled in a subdirectory (#15325) fdbfcfdf Ninja: Generate rules only for languages compiled in a target (#15325)
| * | | | | | Tests: Test using objects from a language enabled in a subdirectory (#15325)Brad King2014-12-235-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a test case that enables CXX in the top level and C in a subdirectory. Create an executable in the top level that uses C objects compiled in the subdirectory. Strictly speaking this is not defined behavior for all language combinations, but happens to work in this case. Test this behavior since projects might try to use it.
| * | | | | | Ninja: Generate rules only for languages compiled in a target (#15325)Brad King2014-12-231-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactoring in commit v3.1.0-rc1~688^2~2 (cmTarget: Compute languages from object libraries on demand, 2014-03-18) taught cmTarget::GetLanguages to (correctly) include the languages of object library sources. Previously this was done only in cmTarget::ComputeLinkImplementationLanguages to choose the linker language. The Ninja generator writes out generic build rules for each language compiled within a target using the rule variables defined in the directory of the target. This only needs to be done for languages actually compiled within the current target. Switch from using the cmTarget::GetLanguages method to get the list of languages over to using cmTarget::GetSourceFiles directly so we do not get the languages in object libraries. Strictly speaking this should make no difference because it is not safe to use objects from a language not enabled in the directory containing a target or else the link information for the language may not be considered. However, in cases when no link information happens to be needed for a language it was possible in CMake 3.0 and below to enable a language only in a subdirectory providing an object library, and then use the objects from a containing directory. The above change teaches the Ninja generator to continue working in this case.
* | | | | | | Merge topic 'cpack-PackageMaker-package-size'Brad King2014-12-241-0/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 42ed76bc cpack: Fix installed size computation with PackageMaker generator
| * | | | | | | cpack: Fix installed size computation with PackageMaker generatorCalin Cascaval2014-12-221-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the CPACK_PACKAGING_INSTALL_PREFIX when looking for files in a component. Otherwise we report all packages having size 1.
* | | | | | | | CMake Nightly Date StampKitware Robot2014-12-241-1/+1
| |_|/ / / / / |/| | | | | |
* | | | | | | Merge branch 'release'Brad King2014-12-230-0/+0
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Merge branch 'ninja-fix-crash-on-error' into releaseBrad King2014-12-231-1/+4
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| * | | | | | Merge branch 'CPackComponent-docs-fix' into releaseBrad King2014-12-221-2/+2
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'backport-suncc-fixes' into releaseBrad King2014-12-221-2/+3
| |\ \ \ \ \ \ \