summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* jsoncpp: Build the library within CMakeBrad King2015-01-155-1/+43
| | | | | | | | | Update json/json.h to account for our lack of autolink.h. Update json/config.h to include KWSys Large File Support configuration so that consistent stream libraries are used (on AIX with XL). Add a cm_jsoncpp_reader.h header to include the CMake-provided copy of the json/reader.h header from CMake sources.
* jsoncpp: Include "config.h" before system headersBrad King2015-01-151-2/+2
|
* Merge branch 'jsoncpp-upstream' into import-jsoncppBrad King2015-01-1318-0/+6249
|\ | | | | | | | | Use a subtree merge to place the upstream content in the Utilities/cmjsoncpp directory.
| * JsonCpp 1.0.0 (reduced)JsonCpp Upstream2015-01-1318-0/+6249
| | | | | | | | | | | | | | | | | | | | | | | | | | Extract upstream JsonCpp using the following shell code. url=https://github.com/open-source-parsers/jsoncpp && v=1.0.0 && r=7165f6ac && paths=" LICENSE include/json src/lib_json " && remove=" include/json/autolink.h src/lib_json/CMakeLists.txt src/lib_json/sconscript src/lib_json/version.h.in " && mkdir jsoncpp-$v-g$r-reduced && git clone $url jsoncpp-git && date=$(cd jsoncpp-git && git log -n 1 --format='%cd' $r) && (cd jsoncpp-git && git checkout $r && git archive --format=tar $r -- $paths) | (cd jsoncpp-$v-g$r-reduced && tar xv && rm -f $remove) && echo "g$r date: $date"
* jsoncpp: Add .gitattributes to skip whitespace checksBrad King2015-01-131-0/+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.
* | | | | | Merge topic 'FindLATEX-components'Brad King2015-01-122-8/+163
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 89e08de8 FindLATEX: Add components for XeLaTeX and LuaLaTeX c32f6919 FindLATEX: Add components Biber and xindy 222ee2c0 FindLATEX: Add components PDFtoPS and HTLATEX 07a3f9ad FindLATEX: Add components handling
| * | | | | | 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
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8435088d Help: Document CMAKE_FIND_PACKAGE_NAME variable b8abd258 find_package: Document CMAKE_FIND_PACKAGE_NAME variable
| * | | | | | | 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
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | Signed-off-by: Gregor Jasny <gjasny@googlemail.com>
* | | | | | | Merge topic 'FindOpenSSL-use-header-version'Brad King2015-01-121-3/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 99b13820 FindOpenSSL: Always extract version from detected header (#15075)
| * | | | | | | FindOpenSSL: Always extract version from detected header (#15075)Aku Kotkavuo2015-01-111-3/+1
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Do not use the _OPENSSL_VERSION computed by pkg-config because the user may change OPENSSL_INCLUDE_DIR.
* | | | | | | Merge topic 'drop-ancient-workarounds'Brad King2015-01-12135-930/+615
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0f7bdd61 Remove VS 6 special case. 5e92c826 Remove some obsolete stuff. 15e42bb2 cmStandardIncludes: Remove obsolete cmOStringStream. 931e055d Port all cmOStringStream to std::ostringstream. f194a009 Remove unused cmIStringStream class. 3ec1bb15 cmStandardIncludes: Remove std namespace hack. bb3bce70 cmStandardIncludes: Remove ANSI_FOR_SCOPE hack. 28fa4923 cmStandardIncludes: Remove iostreams workaround for obsolete Compaq compiler. 837a8a63 cmStandardIncludes: Drop Comeau-related workaround. 4030ddfd Remove Borland-related undef. 17d6a6fd cmStandardIncludes: Remove comment about Borland. 26fb5011 Drop SGI as a CMake host compiler.
| * | | | | | | Remove VS 6 special case.Stephen Kelly2015-01-111-3/+0
| | | | | | | |
| * | | | | | | Remove some obsolete stuff.Stephen Kelly2015-01-113-35/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't need to run compiler tests for ansi-for etc anymore. All supported compilers support the features tested here.
| * | | | | | | cmStandardIncludes: Remove obsolete cmOStringStream.Stephen Kelly2015-01-114-79/+4
| | | | | | | |
| * | | | | | | Port all cmOStringStream to std::ostringstream.Stephen Kelly2015-01-11127-612/+613
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All compilers hosting CMake support the std class.
| * | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All compilers hosting CMake support proper for scoping.
| * | | | | | | cmStandardIncludes: Remove iostreams workaround for obsolete Compaq compiler.Stephen Kelly2015-01-081-49/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is no longer tested on the dashboard.
| * | | | | | | cmStandardIncludes: Drop Comeau-related workaround.Stephen Kelly2015-01-081-13/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The compiler is not tested on the dashboard, and on Windows there are more-natural compilers to use to build CMake.
| * | | | | | | Remove Borland-related undef.Stephen Kelly2015-01-081-1/+0
| | | | | | | |
| * | | | | | | cmStandardIncludes: Remove comment about Borland.Stephen Kelly2015-01-081-11/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code the comment refers to was removed in commit 2db55ffa (Remove borland workarounds., 2014-08-06)
| * | | | | | | Drop SGI as a CMake host compiler.Stephen Kelly2015-01-086-87/+1
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | It has not been tested since commit v3.1.0-rc1~584^2 (Utilities/Release: Drop IRIX binary generation on ferrari, 2014-04-30).
generated by cgit v0.12 at 2025-09-13 20:09:26 (GMT)