summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'FindBoost-update-versions'Brad King2015-01-151-1/+1
|\ | | | | | | | | 4048f7cd FindBoost: Add latest Boost version 1.57.0 and next milestone 1.58.0
| * FindBoost: Add latest Boost version 1.57.0 and next milestone 1.58.0Sergey Nikulov2015-01-131-1/+1
| |
* | Merge topic 'FindRuby-fix-version'Brad King2015-01-151-1/+1
|\ \ | | | | | | | | | | | | 802d0aa0 FindRuby: Fix output check in _RUBY_CONFIG_VAR
| * | FindRuby: Fix output check in _RUBY_CONFIG_VAREvangelos Foutras2015-01-111-1/+1
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v2.8.8~173^2 (FindRuby: clean up querying variables from Ruby, 2012-02-17) we query RbConfig::CONFIG first and, if the command fails or its output equates to a false constant, then fall back to querying Config::CONFIG. Due to the above, an error condition exists with Ruby 2.2.0; when querying RbConfig::CONFIG['TEENY'], the output of '0' will be discarded since it matches the false constant '0'. In previous versions this wasn't a problem, but Ruby 2.2 has completely removed Config::CONFIG. This causes RUBY_VERSION_PATCH to be set to an empty string and the Ruby version to be detected as '2.2.' (instead of '2.2.0'). Fix the output check to explicitly look for an empty string before using the fallback query method. (Someone more familiar with Ruby might be able to deem the fallback as unnecessary and fully remove it.)
* | Merge topic 'FindRuby-zero-version'Brad King2015-01-151-1/+1
|\ \ | | | | | | | | | | | | dd5d2eb1 FindRuby: fix selection of version x.0 (#15345)
| * | FindRuby: fix selection of version x.0 (#15345)David Coppa2015-01-121-1/+1
| | | | | | | | | | | | | | | When "Ruby_FIND_VERSION_MINOR" is 0, the "if(Ruby_FIND_VERSION_MAJOR AND Ruby_FIND_VERSION_MINOR)" check evaluated to false.
* | | Merge topic 'revert-feature_record_msvc'Brad King2015-01-1511-186/+8
|\ \ \ | | | | | | | | | | | | | | | | | | | | 4ce110bb Tests: Revert workaround for COMPILE_FEATURES genex bug 0b7e7e27 Revert topic 'feature_record_msvc'
| * | | Tests: Revert workaround for COMPILE_FEATURES genex bugBrad King2015-01-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The second hunk of commit 07d1f6fc (Features: Properly evaluate if the compiler supports cxx_final, 2014-12-31) was a workaround for a bug in the COMPILE_FEATURES generator expression that caused it never to return 0. Revert the workaround so we can fix the bug instead.
| * | | Revert topic 'feature_record_msvc'Brad King2015-01-1410-185/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert commits: 2d738ce3 Help: Add notes for topic 'feature_record_msvc' f73718c9 Features: Enable writing of MSVC compiler feature header. 64c30bdc Features: Record for MSVC C++ 2015 and MSVC C 2010-2015. 225c0ef8 Features: Record for MSVC 2010-2013. This topic was merged to master prematurely, so remove it.
* | | | CMake Nightly Date StampKitware Robot2015-01-151-1/+1
| | | |
* | | | Merge topic 'Apple-GNU-compiler-features'Brad King2015-01-141-0/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | f121b6b1 Help: Add notes for topic 'Apple-GNU-compiler-features'
| * | | | Help: Add notes for topic 'Apple-GNU-compiler-features'Brad King2015-01-141-0/+5
| | | | |
* | | | | Merge topic 'find-msmpi'Brad King2015-01-141-0/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | a3513cee Help: Add notes for topic 'find-msmpi'
| * | | | | Help: Add notes for topic 'find-msmpi'Brad King2015-01-141-0/+4
| | | | | |
* | | | | | Merge topic 'record-GNU-5-features'Brad King2015-01-141-0/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 31cbfd41 Help: Add notes for topic 'record-GNU-5-features'
| * | | | | | Help: Add notes for topic 'record-GNU-5-features'Brad King2015-01-141-0/+5
| | | | | | |
* | | | | | | Merge branch 'release'Brad King2015-01-140-0/+0
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'backport-cpack_invalid_cmake_generator' into releaseBrad King2015-01-141-0/+8
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'linux-XL-fortran' into releaseBrad King2015-01-143-0/+3
| |\ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ Merge topic 'backport-cpack_invalid_cmake_generator'Brad King2015-01-140-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | ea916230 CPack: Avoid crash on invalid CMake generator name (#15308)
| * | | | | | | | | CPack: Avoid crash on invalid CMake generator name (#15308)Domen Vrankar2015-01-141-0/+8
| | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Case where CPACK_CMAKE_GENERATOR value is non existent or or contains multiple words that were not quoted was not handled and produced a segmentation fault.
* | | | | | | | | CMake Nightly Date StampKitware Robot2015-01-141-1/+1
| | | | | | | | |
* | | | | | | | | Merge branch 'release'Brad King2015-01-130-0/+0
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge branch 'backport-copyright-year' into releaseBrad King2015-01-121-1/+1
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'xcode-ios-compiler-id' into releaseBrad King2015-01-122-6/+1
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'doc-CMAKE_FIND_PACKAGE_NAME' into releaseBrad King2015-01-123-0/+9
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'fix-autouic-regression' into releaseBrad King2015-01-123-1/+10
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
* | | | | | | | | | | | CMake Nightly Date StampKitware Robot2015-01-131-1/+1
| | | | | | | | | | | |
* | | | | | | | | | | | Merge topic 'linux-XL-fortran'Brad King2015-01-120-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ac592231 XL: Fix link flags for executables on Linux with XL compilers
| * | | | | | | | | | | XL: Fix link flags for executables on Linux with XL compilersBrad King2015-01-123-0/+3
| | |_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use "-Wl,-export-dynamic" with XL to match the "-rdynamic" flag used with GNU-like compilers.
* | | | | | | | | | | Merge topic 'join-algorithm'Brad King2015-01-1215-216/+56
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 55a73e6b Use the cmJoin algorithm where possible. 8dc8d756 cmStandardIncludes: Add a join algorithm for string containers. b5813cee cmInstallCommand: Remove unused variable.
| * | | | | | | | | | | Use the cmJoin algorithm where possible.Stephen Kelly2015-01-0814-215/+29
| | | | | | | | | | | |
| * | | | | | | | | | | cmStandardIncludes: Add a join algorithm for string containers.Stephen Kelly2015-01-081-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This requires the input range to supply BidirectionalIterators, which is not a problem for where it is currently useful to us. The alternative would be to not invoke --last;, and instead create an output iterator similar to std::ostream_iterator, but which puts the delimiter before the item to output.
| * | | | | | | | | | | cmInstallCommand: Remove unused variable.Stephen Kelly2015-01-081-1/+0
| | | | | | | | | | | |
* | | | | | | | | | | | Merge topic 'add-xz-support'Brad King2015-01-125-21/+61
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4035ef78 cmake -E tar: error out on multiple compression formats d811d238 cmSystemTools: use an enumeration for compression formats df16dcfb cmake -E tar: add support for .xz files with 'J' b0a5d393 cmake -E tar: clean up flag documentation
| * | | | | | | | | | | | cmake -E tar: error out on multiple compression formatsBen Boeckel2015-01-121-0/+10
| | | | | | | | | | | | |
| * | | | | | | | | | | | cmSystemTools: use an enumeration for compression formatsBen Boeckel2015-01-124-23/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Juggling 3 booleans was unwieldy.
| * | | | | | | | | | | | cmake -E tar: add support for .xz files with 'J'Ben Boeckel2015-01-095-6/+19
| | | | | | | | | | | | |
| * | | | | | | | | | | | cmake -E tar: clean up flag documentationBen Boeckel2015-01-081-1/+1
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge topic 'improve_cobertura'Brad King2015-01-121-9/+39
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ab74553d ctest_coverage: Fix parsing of absolute paths in Cobertura files
| * | | | | | | | | | | | | ctest_coverage: Fix parsing of absolute paths in Cobertura filesZack Galbreath2015-01-121-9/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit fixes a segmentation fault I encountered when my Coverage.xml referenced a system file, eg /usr/lib/python/foo.py. Similar to other CMake coverage parsers, this one now ignores any files it finds that are not located within this project's source or binary directories.
* | | | | | | | | | | | | | Merge topic 'backport-copyright-year'Brad King2015-01-120-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3515b0a4 Copyright.txt: Update year range to end in 2015
| * | | | | | | | | | | | | Copyright.txt: Update year range to end in 2015Brad King2015-01-121-1/+1
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge topic 'Apple-GNU-compiler-features'Brad King2015-01-122-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 00f66a04 Record compile features for GNU on Apple.
| * | | | | | | | | | | | Record compile features for GNU on Apple.Stephen Kelly2015-01-112-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tested with GNU 4.8 binary (bottle) from homebrew, and assumed to work with the others.
* | | | | | | | | | | | | Merge topic 'fix-autouic-regression'Brad King2015-01-123-1/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9a673737 QtAutoUic: Add a test for the regression in the parent commit. 7c585699 QtAutoUic: Restore source file AUTOUIC_OPTIONS settings
| * | | | | | | | | | | | QtAutoUic: Add a test for the regression in the parent commit.Stephen Kelly2015-01-122-0/+9
| | | | | | | | | | | | |
| * | | | | | | | | | | | QtAutoUic: Restore source file AUTOUIC_OPTIONS settingsJustin Borodinsky2015-01-111-1/+1
| | |/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The "." in the extension was dropped by commit v3.1.0-rc1~556^2~2 (cmSourceFile: Cache the isUiFile check, 2014-02-08) by mistake. This caused the options to not be set.
* | | | | | | | | | | | Merge topic 'xcode-ios-compiler-id'Brad King2015-01-122-6/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7b7209f6 Xcode: Do not require code signing for compiler id (#15214)
| * | | | | | | | | | | Xcode: Do not require code signing for compiler id (#15214)Brad King2015-01-112-6/+1
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The approach in commit v3.1.0-rc1~1^2 (Xcode: Fix compiler id detection when code signing is required, 2014-10-22) still requires a code signing key when targeting a real device. Instead set CODE_SIGNING_REQUIRED to "NO" to tell Xcode not to sign at all. Drop the corresponding setting of the code signing identity.