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

17335 Commits

Author SHA1 Message Date
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
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 20d60c6361 Merge topic 'sln-bom' 
61cf781a Encoding:  Write Visual Studio solution file with BOM.
 2015-01-11 12:00:26 -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 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
Stephen Kelly 34a990946c get_target_property: discern empty from undefined properties (#15333) 
This was accidentally regressed by commit v3.1.0-rc1~812^2~50
(stringapi: Use strings for property names, 2013-09-02).
 2015-01-11 11:43:58 -05:00
Stephen Kelly 5e92c82655 Remove some obsolete stuff. 
We don't need to run compiler tests for ansi-for etc anymore. All
supported compilers support the features tested here.
 2015-01-11 17:06:04 +01:00
Stephen Kelly 15e42bb27c cmStandardIncludes: Remove obsolete cmOStringStream. 2015-01-11 17:06:04 +01:00
Stephen Kelly 931e055d8c Port all cmOStringStream to std::ostringstream. 
All compilers hosting CMake support the std class.
 2015-01-11 17:06:03 +01:00
Stephen Kelly 3660d063bc cmTarget: Use insert instead of std::copy. 
insert can reserve() memory in the container, and this is
more-consistent with the rest of CMake now.
 2015-01-11 17:00:56 +01:00
Stephen Kelly ac3d382920 Help: Remove documented restriction on find in conditions. 
The necessary conversion is supported by all CMake host compilers.
 2015-01-11 17:00:56 +01:00
Stephen Kelly 238dd2fbab Use insert instead of a loop in some cases. 
Limit this change to inserting into a vector from a vector.

A follow up change can use insert for inserting into a set.
 2015-01-11 17:00:55 +01:00
Stephen Kelly 2f7ef7e38d Revert "Misc. fixes for the Oracle / Sun compiler." 
This reverts commit 97b65f8156.
 2015-01-11 17:00:55 +01:00
Stephen Kelly 6162c9194b Use two-iterator std::set::insert where appropriate. 2015-01-11 17:00:55 +01:00
Kitware Robot 7e5e8a37b5 CMake Nightly Date Stamp 2015-01-11 00:01:09 -05:00
Brad King e5b9142097 Merge branch 'upstream-kwsys' into update-kwsys 2015-01-10 12:09:04 -05:00
Kitware Robot ccd0046667 CMake Nightly Date Stamp 2015-01-10 00:01:15 -05:00
Ben Boeckel df16dcfb44 cmake -E tar: add support for .xz files with 'J' 2015-01-09 10:35:01 -05:00
Kitware Robot 4aa9c64511 CMake Nightly Date Stamp 2015-01-09 00:01:10 -05:00
Ben Boeckel b0a5d3932d cmake -E tar: clean up flag documentation 2015-01-08 16:56:17 -05:00
Stephen Kelly 55a73e6b1f Use the cmJoin algorithm where possible. 2015-01-08 22:28:18 +01:00
Stephen Kelly 8dc8d756bc cmStandardIncludes: Add a join algorithm for string containers. 
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.
 2015-01-08 22:28:18 +01:00
Stephen Kelly b5813ceeb5 cmInstallCommand: Remove unused variable. 2015-01-08 22:25:18 +01:00
Stephen Kelly f194a009c8 Remove unused cmIStringStream class. 2015-01-08 22:10:15 +01:00
Stephen Kelly 3ec1bb1537 cmStandardIncludes: Remove std namespace hack. 2015-01-08 22:10:15 +01:00
Stephen Kelly bb3bce706a cmStandardIncludes: Remove ANSI_FOR_SCOPE hack. 
All compilers hosting CMake support proper for scoping.
 2015-01-08 22:10:15 +01:00
Stephen Kelly 28fa4923c3 cmStandardIncludes: Remove iostreams workaround for obsolete Compaq compiler. 
It is no longer tested on the dashboard.
 2015-01-08 22:10:15 +01:00
Stephen Kelly 837a8a6312 cmStandardIncludes: Drop Comeau-related workaround. 
The compiler is not tested on the dashboard, and on Windows there
are more-natural compilers to use to build CMake.
 2015-01-08 22:10:15 +01:00
Stephen Kelly 4030ddfda8 Remove Borland-related undef. 2015-01-08 22:10:14 +01:00
Stephen Kelly 17d6a6fd59 cmStandardIncludes: Remove comment about Borland. 
The code the comment refers to was removed in commit 2db55ffa (Remove
borland workarounds., 2014-08-06)
 2015-01-08 22:10:14 +01:00
Stephen Kelly 26fb50114f Drop SGI as a CMake host compiler. 
It has not been tested since commit v3.1.0-rc1~584^2 (Utilities/Release: Drop
IRIX binary generation on ferrari, 2014-04-30).
 2015-01-08 22:10:14 +01:00
Brad King 0042ad9748 Merge topic 'cpack_invalid_cmake_generator' 
f89e41c3 CPack invalid CMake generator
 2015-01-08 14:58:01 -05:00
Brad King c1c1fcb17c Merge topic 'fix-error-message-typo-tar-cmd' 
c4e74367 cmcmd: fix copy/paste typo in '-E tar t' command
 2015-01-08 14:57:59 -05:00
Brad King 3fb174dd0b Merge topic 'drop-GNU-2.95' 
f07d96cc Remove workaround for GCC < 3 ios_base absence.
5a8b9437 Remove GCC 2.95 support macros in favor of template versions.
 2015-01-08 14:57:45 -05:00
Brad King dc451574c6 Merge topic 'base64-casts' 
0bdd4ebf cmCTest: Use size_t for cmsysBase64_Encode return value
a9fae8ac CTest: Fix integer overflow when uploading huge files
 2015-01-08 14:57:41 -05:00
Brad King 9bb7f8f898 Merge topic 'update-kwsys' 
1819d4ad Merge branch 'upstream-kwsys' into update-kwsys
6ed23ff4 KWSys 2014-12-23 (5a15cb3b)
 2015-01-08 14:57:38 -05:00
Brad King 344604220d Merge branch 'kwsys-Terminal-xterm-termite' into release 2015-01-08 14:43:10 -05:00
Simon Gomizelj 2866a503a7 KWSys Terminal: Add xterm-termite to VT100 color support whitelist 2015-01-08 12:02:37 -05:00
Kitware Robot 46f87655c9 CMake Nightly Date Stamp 2015-01-08 00:01:08 -05:00
Kitware Robot 8c4b7c567b CMake Nightly Date Stamp 2015-01-07 00:01:08 -05:00
Kitware Robot 73144c098d CMake Nightly Date Stamp 2015-01-06 00:01:12 -05:00
Ben Boeckel c4e743674f cmcmd: fix copy/paste typo in '-E tar t' command 2015-01-05 13:53:53 -05:00
Kitware Robot 4b70635c9f CMake Nightly Date Stamp 2015-01-05 00:01:09 -05:00
Kitware Robot 592dd35570 CMake Nightly Date Stamp 2015-01-04 00:01:08 -05:00
Kitware Robot 472553b4c1 CMake Nightly Date Stamp 2015-01-03 00:01:08 -05:00
Domen Vrankar f89e41c3e7 CPack invalid CMake generator 
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.
 2015-01-02 10:46:08 +01:00
Kitware Robot 24dfa74214 CMake Nightly Date Stamp 2015-01-02 00:01:08 -05:00
Stephen Kelly f07d96ccf4 Remove workaround for GCC < 3 ios_base absence. 2015-01-01 12:45:54 +01:00
Stephen Kelly 5a8b9437c2 Remove GCC 2.95 support macros in favor of template versions. 
GCC < 3 is no longer supported as a host compiler.
 2015-01-01 12:44:11 +01:00
Kitware Robot ec31926d24 CMake Nightly Date Stamp 2015-01-01 00:01:09 -05:00
Kitware Robot c2445d3dfd CMake Nightly Date Stamp 2014-12-31 00:01:08 -05:00
Kitware Robot 3b62cb7244 CMake Nightly Date Stamp 2014-12-30 00:01:07 -05:00
Kitware Robot ca3d08e6b5 CMake Nightly Date Stamp 2014-12-29 00:01:08 -05:00
Kitware Robot 8e61140178 CMake Nightly Date Stamp 2014-12-28 00:01:07 -05:00
Kitware Robot 028cdfb3de CMake Nightly Date Stamp 2014-12-27 00:01:08 -05:00
Clinton Stimpson 61cf781a62 Encoding: Write Visual Studio solution file with BOM. 
When configured to use UTF-8 internally, add a UTF-8 BOM
to generated .sln files for Visual Studio to correctly
handle them.
Otherwise, some versions of Visual Studio will read them
as ANSI encoded files.
 2014-12-26 21:15:29 -07:00
Brad King 0bdd4ebfb8 cmCTest: Use size_t for cmsysBase64_Encode return value 2014-12-26 16:23:35 +01:00
Rolf Eike Beer a9fae8ac1d CTest: Fix integer overflow when uploading huge files 
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>
 2014-12-26 16:23:31 +01:00
Kitware Robot 2b28e07c02 CMake Nightly Date Stamp 2014-12-26 00:01:07 -05:00
Kitware Robot 05105d5c13 CMake Nightly Date Stamp 2014-12-25 00:01:09 -05:00
Brad King 8afa15fab1 Merge branch 'ninja-fix-subdir-objlib-languages' into release 2014-12-24 06:41:39 -05:00
Brad King 2a9f3dc6c7 Merge topic 'minor-warning-fixes' 
098fc4a8 cmCMakeMinimumRequired: Use unsigned int for version numbers
1a9ba381 cmParseDelphiCoverage: Remove superfluous semicolons after methods
 2014-12-24 06:38:33 -05:00
Brad King 661622f011 Merge topic 'ninja-fix-subdir-objlib-languages' 
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)
 2014-12-24 06:38:24 -05:00
Brad King c20d3d319c Merge topic 'cpack-PackageMaker-package-size' 
42ed76bc cpack: Fix installed size computation with PackageMaker generator
 2014-12-24 06:38:08 -05:00
Kitware Robot 279a2bcd65 CMake Nightly Date Stamp 2014-12-24 00:01:10 -05:00
Christoph Grüninger 098fc4a862 cmCMakeMinimumRequired: Use unsigned int for version numbers 2014-12-23 09:05:25 -05:00
Christoph Grüninger 1a9ba38174 cmParseDelphiCoverage: Remove superfluous semicolons after methods 2014-12-23 09:05:11 -05:00
Brad King 90b015a0ba Merge topic 'ninja-fix-crash-on-error' 
9a13fcbf Ninja: Do not crash when CMAKE_<LANG>_COMPILE_OBJECT is empty (#15325)
 2014-12-23 08:53:59 -05:00
Brad King 23e9bc55f3 Merge topic 'base64-constref' 
82fbf490 cmCTestTestHandler: take reference to temporary string instead of doing a copy
 2014-12-23 08:53:56 -05:00
Brad King 656af73bca Merge topic 'cleanup-ExpandListArgument-usage' 
e2a489c7 Remove some temporary vectors for ExpandListArgument.
0f99feec cmGeneratorExpression: Remove unused header.
722f1a71 CTest: Expand a string directly into a container.
 2014-12-23 08:53:50 -05:00
Brad King a19a43a930 Merge topic 'ctest-coverage-extra-line-error' 
9c4984b4 ctest_coverage: Fix error message to report the file name
 2014-12-23 08:53:48 -05:00
Brad King 1819d4ad1f Merge branch 'upstream-kwsys' into update-kwsys 2014-12-23 08:47:34 -05:00
Kitware Robot 7a2d1cd6d4 CMake Nightly Date Stamp 2014-12-23 00:01:15 -05:00
Brad King fdbfcfdf01 Ninja: Generate rules only for languages compiled in a target (#15325) 
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.
 2014-12-22 20:13:30 -05:00
Brad King 62b1998403 Merge branch 'ninja-fix-crash-on-error' into release 2014-12-22 20:00:07 -05:00
Brad King 9a13fcbf02 Ninja: Do not crash when CMAKE_<LANG>_COMPILE_OBJECT is empty (#15325) 2014-12-22 18:36:07 -05:00
Rolf Eike Beer 82fbf490b5 cmCTestTestHandler: take reference to temporary string instead of doing a copy 
This will increase the lifetime of the temporary until the end of the function.
 2014-12-22 21:38:59 +01:00
Brad King 6c39bc5520 Merge topic 'macho-parser' 
c294a115 Mach-O: Use Mach-O parser to extract install names instead of otool.
e42da307 Mach-O: Add Mach-O parser for OS X and iOS.
 2014-12-22 13:41:03 -05:00
Clinton Stimpson c294a115f2 Mach-O: Use Mach-O parser to extract install names instead of otool. 
This has much better performance than calling "otool" or "xcrun -r otool"
to extract install names for rpath support.

Fixes bug #15178.
 2014-12-22 11:33:00 -07:00
Clinton Stimpson e42da30782 Mach-O: Add Mach-O parser for OS X and iOS. 
This parser also supports fat binaries which archive multiple
Mach-O binaries.
 2014-12-22 11:32:10 -07:00
Vladislav Vinogradov 9c4984b4e5 ctest_coverage: Fix error message to report the file name 
Print file name instead of line content for "Looks like there are more
lines in the file:" error message.
 2014-12-22 09:25:24 -05:00
Calin Cascaval 42ed76bc99 cpack: Fix installed size computation with PackageMaker generator 
Use the CPACK_PACKAGING_INSTALL_PREFIX when looking for files in a
component.  Otherwise we report all packages having size 1.
 2014-12-22 09:17:12 -05:00
Kitware Robot d63609ed2a CMake Nightly Date Stamp 2014-12-22 00:01:08 -05:00
Kitware Robot 2c76f6f4da CMake Nightly Date Stamp 2014-12-21 00:01:07 -05:00
Kitware Robot 5bb0ae03ef CMake Nightly Date Stamp 2014-12-20 00:01:09 -05:00
Brad King bf731becfa Merge topic 'update-kwsys' 
2e9acb6d Merge branch 'upstream-kwsys' into update-kwsys
1f7de543 KWSys 2014-12-18 (87c65319)
 2014-12-19 08:26:59 -05:00
Brad King ccd5822a83 Merge topic 'osx-cfbundle-tweaks' 
b189c599 Tests: Run CFBundleTest only with valid configuration
3a605693 Xcode: Call IsCFBundleOnApple to decide if bundle is being built
207b7af0 cmTarget: Use GetCFBundleDirectory within GetFullNameInternal
 2014-12-19 08:26:57 -05:00
Brad King 1ac8523c3b Merge topic 'install-EXPORT-absolute-prefix' 
dd089e08 install: Allow absolute EXPORT destination with relative targets (#15258)
 2014-12-19 08:26:55 -05:00
Kitware Robot d48ccbe458 CMake Nightly Date Stamp 2014-12-19 00:01:09 -05:00
Stephen Kelly e2a489c76a Remove some temporary vectors for ExpandListArgument. 
Expand directly into the target when possible.
 2014-12-19 00:06:00 +01:00
Stephen Kelly 0f99feec04 cmGeneratorExpression: Remove unused header. 2014-12-19 00:06:00 +01:00
Stephen Kelly 722f1a71e3 CTest: Expand a string directly into a container. 
Change the follow-up loop to use a const_iterator to log the
content.
 2014-12-19 00:05:57 +01:00
Chuck Atkins 107dcac3e0 Fix compilation with the Oracle / Sun compiler (#15318) 
One piece of code has some ambiguous type deduction that seems to
resolve correctly for most compilers but not for the Oracle compiler.
Make it more explicit.
 2014-12-18 11:23:41 -05:00
Brad King 2e9acb6d43 Merge branch 'upstream-kwsys' into update-kwsys 2014-12-18 10:17:20 -05:00
Brad King cd7bde80bf Merge topic 'update-kwsys' 
3470704f Merge branch 'upstream-kwsys' into update-kwsys
6a5ab894 KWSys 2014-12-16 (cc4046a8)
 2014-12-18 10:16:42 -05:00
Brad King 45b1e31451 Merge topic 'vs-nsight-tegra-min-api' 
eeaa25e5 Add 'ANDROID_API_MIN' target property to set Android Target MIN API
 2014-12-18 10:16:40 -05:00
Brad King a39e65a817 Merge topic 'fix-sha2-cast-constness' 
d4d2d72f sha2: Fix -Wcast-qual warnings by adding const to some casts
 2014-12-18 10:16:38 -05:00