summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* jsoncpp: Add missing assert before strcmp in json_value.cppBrad King2015-01-151-2/+6
* jsoncpp: Add missing <iosfwd> include in json/writer.hBrad King2015-01-151-0/+1
* jsoncpp: Include C headers since we use APIs without std::Brad King2015-01-152-5/+5
* jsoncpp: Disable warnings to avoid changing 3rd party codeBrad King2015-01-152-0/+12
* jsoncpp: Build the library within CMakeBrad King2015-01-155-1/+43
* jsoncpp: Include "config.h" before system headersBrad King2015-01-151-2/+2
* Merge branch 'jsoncpp-upstream' into import-jsoncppBrad King2015-01-1318-0/+6249
|\
| * JsonCpp 1.0.0 (reduced)JsonCpp Upstream2015-01-1318-0/+6249
* jsoncpp: Add .gitattributes to skip whitespace checksBrad King2015-01-131-0/+1
* Merge topic 'linux-XL-fortran'Brad King2015-01-120-0/+0
|\
| * XL: Fix link flags for executables on Linux with XL compilersBrad King2015-01-123-0/+3
* | Merge topic 'join-algorithm'Brad King2015-01-1215-216/+56
|\ \
| * | 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
| * | cmInstallCommand: Remove unused variable.Stephen Kelly2015-01-081-1/+0
* | | Merge topic 'add-xz-support'Brad King2015-01-125-21/+61
|\ \ \
| * | | 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
| * | | 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
|\ \ \ \
| * | | | ctest_coverage: Fix parsing of absolute paths in Cobertura filesZack Galbreath2015-01-121-9/+39
* | | | | Merge topic 'backport-copyright-year'Brad King2015-01-120-0/+0
|\ \ \ \ \
| * | | | | 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
|\ \ \ \ \
| * | | | | Record compile features for GNU on Apple.Stephen Kelly2015-01-112-3/+3
* | | | | | Merge topic 'fix-autouic-regression'Brad King2015-01-123-1/+10
|\ \ \ \ \ \
| * | | | | | 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
| | |/ / / / | |/| | | |
* | | | | | Merge topic 'xcode-ios-compiler-id'Brad King2015-01-122-6/+1
|\ \ \ \ \ \
| * | | | | | Xcode: Do not require code signing for compiler id (#15214)Brad King2015-01-112-6/+1
| |/ / / / /
* | | | | | Merge topic 'FindLATEX-components'Brad King2015-01-122-8/+163
|\ \ \ \ \ \
| * | | | | | FindLATEX: Add components for XeLaTeX and LuaLaTeXChristoph Grüninger2015-01-111-1/+32
| * | | | | | FindLATEX: Add components Biber and xindyChristoph Grüninger2015-01-111-0/+30
| * | | | | | FindLATEX: Add components PDFtoPS and HTLATEXChristoph Grüninger2015-01-111-0/+30
| * | | | | | FindLATEX: Add components handlingChristoph Grüninger2014-12-232-7/+71
* | | | | | | Merge topic 'doc-CMAKE_FIND_PACKAGE_NAME'Brad King2015-01-123-0/+9
|\ \ \ \ \ \ \
| * | | | | | | Help: Document CMAKE_FIND_PACKAGE_NAME variableBrad King2015-01-112-0/+7
| * | | | | | | find_package: Document CMAKE_FIND_PACKAGE_NAME variableGregor Jasny2015-01-111-0/+2
| | |/ / / / / | |/| | | | |
* | | | | | | Merge topic 'FindOpenSSL-use-header-version'Brad King2015-01-121-3/+1
|\ \ \ \ \ \ \
| * | | | | | | FindOpenSSL: Always extract version from detected header (#15075)Aku Kotkavuo2015-01-111-3/+1
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge topic 'drop-ancient-workarounds'Brad King2015-01-12135-930/+615
|\ \ \ \ \ \ \
| * | | | | | | Remove VS 6 special case.Stephen Kelly2015-01-111-3/+0
| * | | | | | | Remove some obsolete stuff.Stephen Kelly2015-01-113-35/+0
| * | | | | | | cmStandardIncludes: Remove obsolete cmOStringStream.Stephen Kelly2015-01-114-79/+4
| * | | | | | | Port all cmOStringStream to std::ostringstream.Stephen Kelly2015-01-11127-612/+613
| * | | | | | | Remove unused cmIStringStream class.Stephen Kelly2015-01-081-31/+0
| * | | | | | | cmStandardIncludes: Remove std namespace hack.Stephen Kelly2015-01-081-5/+0
| * | | | | | | cmStandardIncludes: Remove ANSI_FOR_SCOPE hack.Stephen Kelly2015-01-081-7/+0
| * | | | | | | cmStandardIncludes: Remove iostreams workaround for obsolete Compaq compiler.Stephen Kelly2015-01-081-49/+0