kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
26,465 Commits 1 Branch 14 Tags 53 MiB
Commit Graph

26465 Commits

Author SHA1 Message Date
Brad King 50032bc847 jsoncpp: Add missing assert before strcmp in json_value.cpp 
The strcmp function does not allow NULL pointers, so add an
assert to tell Clang scan-build that the code does not expect
a NULL pointer.
 2015-01-15 11:39:03 -05:00
Brad King ad94b0521e jsoncpp: Add missing <iosfwd> include in json/writer.h 
The header uses std::ostream, so it must be declared.
 2015-01-15 11:39:03 -05:00
Brad King 7eba04fda1 jsoncpp: Include C headers since we use APIs without std:: 2015-01-15 11:39:03 -05:00
Brad King 06f41e986c jsoncpp: Disable warnings to avoid changing 3rd party code 
Add '-w' or equivalent flag on compilers supporting it.
Tell MSVC to use its lowest warning level inside jsoncpp sources.
 2015-01-15 11:39:01 -05:00
Brad King 1fc556536e jsoncpp: Build the library within CMake 
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.
 2015-01-15 11:37:17 -05:00
Brad King 84d5674d4e jsoncpp: Include "config.h" before system headers 2015-01-15 11:36:49 -05:00
Brad King a263d519ff Merge branch 'jsoncpp-upstream' into import-jsoncpp 
Use a subtree merge to place the upstream content in the
Utilities/cmjsoncpp directory.
 2015-01-13 14:42:00 -05:00
JsonCpp Upstream 53f6ccb0ee JsonCpp 1.0.0 (reduced) 
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"
 2015-01-13 14:41:08 -05:00
Brad King 32fd56b066 jsoncpp: Add .gitattributes to skip whitespace checks 2015-01-13 10:36:19 -05:00
Brad King 3dec4a2bfb Merge topic 'linux-XL-fortran' 
ac592231 XL: Fix link flags for executables on Linux with XL compilers
 2015-01-12 13:08:58 -05:00
Brad King ac5922317f XL: Fix link flags for executables on Linux with XL compilers 
Use "-Wl,-export-dynamic" with XL to match the "-rdynamic" flag used
with GNU-like compilers.
 2015-01-12 12:59:52 -05:00
Brad King dd6c596c12 Merge topic 'join-algorithm' 
55a73e6b Use the cmJoin algorithm where possible.
8dc8d756 cmStandardIncludes: Add a join algorithm for string containers.
b5813cee cmInstallCommand: Remove unused variable.
 2015-01-12 09:41:02 -05:00
Brad King d9a6ea4599 Merge topic 'add-xz-support' 
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
 2015-01-12 09:39:40 -05:00
Brad King 212bf1f82a Merge topic 'improve_cobertura' 
ab74553d ctest_coverage: Fix parsing of absolute paths in Cobertura files
 2015-01-12 09:39:38 -05:00
Ben Boeckel 4035ef786d cmake -E tar: error out on multiple compression formats 2015-01-12 09:36:25 -05:00
Ben Boeckel d811d238ab cmSystemTools: use an enumeration for compression formats 
Juggling 3 booleans was unwieldy.
 2015-01-12 09:36:25 -05:00
Zack Galbreath ab74553db4 ctest_coverage: Fix parsing of absolute paths in Cobertura files 
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.
 2015-01-12 09:34:50 -05:00
Brad King cdc688eab0 Merge topic 'backport-copyright-year' 
3515b0a4 Copyright.txt: Update year range to end in 2015
 2015-01-12 09:15:50 -05:00
Brad King 3515b0a40d Copyright.txt: Update year range to end in 2015 2015-01-12 09:14:16 -05:00
Brad King c59cf4f96c Merge topic 'Apple-GNU-compiler-features' 
00f66a04 Record compile features for GNU on Apple.
 2015-01-12 08:57:54 -05:00
Brad King b4f62b875b Merge topic 'fix-autouic-regression' 
9a673737 QtAutoUic: Add a test for the regression in the parent commit.
7c585699 QtAutoUic: Restore source file AUTOUIC_OPTIONS settings
 2015-01-12 08:57:52 -05:00
Brad King af0ee41955 Merge topic 'xcode-ios-compiler-id' 
7b7209f6 Xcode: Do not require code signing for compiler id (#15214)
 2015-01-12 08:57:50 -05:00
Brad King 7f5b4940e1 Merge topic 'FindLATEX-components' 
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
 2015-01-12 08:57:47 -05:00
Brad King c9f3e829e7 Merge topic 'doc-CMAKE_FIND_PACKAGE_NAME' 
8435088d Help: Document CMAKE_FIND_PACKAGE_NAME variable
b8abd258 find_package: Document CMAKE_FIND_PACKAGE_NAME variable
 2015-01-12 08:57:45 -05:00
Brad King 63412a85e0 Merge topic 'FindOpenSSL-use-header-version' 
99b13820 FindOpenSSL: Always extract version from detected header (#15075)
 2015-01-12 08:57:42 -05:00
Brad King b5a467262b Merge topic 'drop-ancient-workarounds' 
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.
 2015-01-12 08:57:39 -05:00
Brad King 6c61ffaf9b Merge topic 'sun-better-stdlib' 
3660d063 cmTarget: Use insert instead of std::copy.
5c28495f Help: Remove documented restriction on template use.
ac3d3829 Help: Remove documented restriction on find in conditions.
36b8de56 Help: Remove documented restriction on insert APIs.
6162c919 Use two-iterator std::set::insert where appropriate.
238dd2fb Use insert instead of a loop in some cases.
2f7ef7e3 Revert "Misc. fixes for the Oracle / Sun compiler."
4c69ec6f SolarisStudio: Use alternative standard library to build CMake.
 2015-01-12 08:57:37 -05:00
Kitware Robot 9fced51858 CMake Nightly Date Stamp 2015-01-12 00:01:19 -05:00
Stephen Kelly 9a67373716 QtAutoUic: Add a test for the regression in the parent commit. 2015-01-12 01:41:27 +01:00
Brad King 7b7209f635 Xcode: Do not require code signing for compiler id (#15214) 
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.
 2015-01-11 16:50:39 -05:00
Christoph Grüninger 89e08de8c2 FindLATEX: Add components for XeLaTeX and LuaLaTeX 2015-01-11 15:42:12 -05:00
Christoph Grüninger c32f691944 FindLATEX: Add components Biber and xindy 2015-01-11 15:41:37 -05:00
Christoph Grüninger 222ee2c059 FindLATEX: Add components PDFtoPS and HTLATEX 2015-01-11 15:41:06 -05:00
Aku Kotkavuo 99b1382071 FindOpenSSL: Always extract version from detected header (#15075) 
Do not use the _OPENSSL_VERSION computed by pkg-config because
the user may change OPENSSL_INCLUDE_DIR.
 2015-01-11 15:32:55 -05:00
Brad King 8435088d6a Help: Document CMAKE_FIND_PACKAGE_NAME variable 2015-01-11 15:20:14 -05:00
Gregor Jasny b8abd25897 find_package: Document CMAKE_FIND_PACKAGE_NAME variable 
Signed-off-by: Gregor Jasny <gjasny@googlemail.com>
 2015-01-11 15:16:48 -05:00
Justin Borodinsky 7c58569930 QtAutoUic: Restore source file AUTOUIC_OPTIONS settings 
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.
 2015-01-11 15:11:18 -05:00
Brad King 16d68daccb Merge topic 'linux-XL-fortran' 
4729547a XL: Fix link flags for executables on Linux with XL compilers
 2015-01-11 14:58:34 -05:00
Stephen Kelly 00f66a0451 Record compile features for GNU on Apple. 
Tested with GNU 4.8 binary (bottle) from homebrew, and assumed to work
with the others.
 2015-01-11 18:34:25 +01:00
Brad King 30289e07ce Merge branch 'release' 2015-01-11 12:05:43 -05:00
Brad King 68f9e67242 Merge topic 'tests-encoding' 
9a8ab866 Encoding:  Modify tests to work using non-ascii paths.
 2015-01-11 12:00:30 -05:00
Brad King 56324568cf Merge topic 'FindCUDA.cmake/UseCMAKE_CXX_FLAGS_separableCompilation' 
b4e54f9b FindCUDA: Add relevant CMAKE_{C,CXX}_FLAGS for separable compilation
 2015-01-11 12:00:28 -05:00
Brad King 20d60c6361 Merge topic 'sln-bom' 
61cf781a Encoding:  Write Visual Studio solution file with BOM.
 2015-01-11 12:00:26 -05:00
Brad King 775fb2e0b0 Merge topic 'feature_record_msvc' 
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.
 2015-01-11 12:00:24 -05:00
Brad King 1c0d6a7cb5 Merge topic 'refactor-CompileFeatures-test' 
a15675ef Features: Quote all compiler names when comparing with COMPILER_ID
07d1f6fc Features: Properly evaluate if the compiler supports cxx_final.
6296192d Features: Add a comment explaining part of test.
c13656e7 Features: Test nullptr as a side-effect activation of static_assert.
3e34e833 Features: Test feature propagation with more-common features.
b3e86f4e Features: Test an expectation of whether OVERRIDE_CONTROL is expected
 2015-01-11 12:00:22 -05:00
Brad King cb5fc7b993 Merge topic 'fix-empty-target-property-queries' 
c6d03a10 tests: add tests for querying properties
76ff92e0 set_tests_properties: fix documentation
28214862 get_test_property: clarify the documentation
34a99094 get_target_property: discern empty from undefined properties (#15333)
 2015-01-11 12:00:20 -05:00
Brad King f098e0e22b Merge topic 'kwsys-Terminal-xterm-termite' 
2866a503 KWSys Terminal: Add xterm-termite to VT100 color support whitelist
 2015-01-11 12:00:16 -05:00
Brad King 4a549e7e0e Merge topic 'update-kwsys' 
e5b91420 Merge branch 'upstream-kwsys' into update-kwsys
54d83cae KWSys 2015-01-09 (425fa73e)
 2015-01-11 12:00:14 -05:00
Brad King ca5fe169aa Merge branch 'fix-empty-target-property-queries' into release 2015-01-11 11:50:14 -05:00
Ben Boeckel c6d03a1072 tests: add tests for querying properties 2015-01-11 11:45:44 -05:00