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

29055 Commits

Author SHA1 Message Date
Brad King 9a101b6754 Merge topic 'suppress-osx-arch-linker-warning' 
1f3bb59b CTestCustom: Suppress more OS X universal binary link arch warnings
fd5cbbe0 CTestCustom: Suppress more OS X universal binary link arch warnings
 2015-04-13 09:05:08 -04:00
Brad King 2cf5415d9f Merge topic 'update-kwsys' 
e5388583 Merge branch 'upstream-kwsys' into update-kwsys
d34d5a37 KWSys 2015-04-10 (69bccf2e)
 2015-04-13 09:05:06 -04:00
Brad King e538858349 Merge branch 'upstream-kwsys' into update-kwsys 2015-04-13 09:01:59 -04:00
KWSys Robot d34d5a370e KWSys 2015-04-10 (69bccf2e) 
Extract upstream KWSys using the following shell commands.

$ git archive --prefix=upstream-kwsys/ 69bccf2e | tar x
$ git shortlog --no-merges --abbrev=8 --format='%h %s' 9367a33b..69bccf2e
Brad King (1):
      69bccf2e SystemTools: Teach Touch with !create to succeed on missing file

Change-Id: I4af502542578b6a16ca4ddffb03553a046378e56
 2015-04-13 09:01:55 -04:00
Nils Gladitz a198839a7b CTest: Fix locale used for VCS updates 
6a661f0603 fixed the
locale used for message output but at the same time broke the locale
used for filename encodings.

This commit preserves LC_CTYPE in the presence of LC_ALL.
 2015-04-13 08:59:34 -04:00
Kitware Robot 74c8b92844 CMake Nightly Date Stamp 2015-04-13 00:01:04 -04:00
Stephen Kelly 07d44d638b cmake: Remove confusing duplication. 2015-04-12 23:10:45 +02:00
Stephen Kelly ea819b29f8 cmMakefile: Remove unused method. 2015-04-12 23:10:45 +02:00
Stephen Kelly 6ad86c7fc4 cmMakefile: Remove bad comment. 2015-04-12 23:10:45 +02:00
Stephen Kelly fca2b542b4 cmMakefile: Internalize setting of CMakeInstance on Properties. 2015-04-12 23:10:45 +02:00
Stephen Kelly 7bb4e3db06 cmMakefile: Out-of-line Home directory accessors. 2015-04-12 23:10:44 +02:00
Stephen Kelly 6241253a4b cmake: Out-of-line Home and Start directory methods. 2015-04-12 23:10:44 +02:00
Stephen Kelly 0ee3ccb3b0 cmake: Fix variable name bugs. 2015-04-12 23:10:44 +02:00
Stephen Kelly 57dd094ede Use vector, not list for cmCommand storage. 2015-04-12 20:09:47 +02:00
Stephen Kelly 6deb43e6c8 Remove some files which do not need to be in BootstrapCommands. 2015-04-12 20:09:31 +02:00
Stephen Kelly ecdb1b3bba Add some missing includes. 2015-04-12 20:09:25 +02:00
Stephen Kelly 04b307b961 cmake: Simplify CommandExists method. 2015-04-12 20:08:49 +02:00
Stephen Kelly 0f1f324b0d cmake: Rename oddly named variables. 2015-04-12 20:08:49 +02:00
Stephen Kelly 275185ac2b cmake: Constify GetCommand method. 2015-04-12 20:08:49 +02:00
Stephen Kelly c57f086a81 cmake: Don't lower-case a string needlessly. 2015-04-12 20:08:48 +02:00
Stephen Kelly 23368c9b83 cmake: Use make_pair instead of Foo::value_type. 
It works with all supported compilers.
 2015-04-12 20:08:48 +02:00
Stephen Kelly 14c70b8c58 cmake: out-of-line try compile state methods. 2015-04-12 20:08:48 +02:00
Stephen Kelly 6ed19e615b cmake: Remove duplicate condition. 2015-04-12 20:08:47 +02:00
Stephen Kelly ade20b433b cmake: Remove DebugConfigs member. 
It adds needless complexity to global property handling.
 2015-04-12 20:08:47 +02:00
Stephen Kelly 6fb306ea3b Test expected value of DEBUG_CONFIGURATIONS global property. 2015-04-12 20:08:46 +02:00
Stephen Kelly 7450a2c6ed cmake: Remove method with no external users. 
Port internal users to access the member.
 2015-04-12 20:08:46 +02:00
Stephen Kelly 8c13d7709b cmake: Don't set the CMakeInstance on the Properties member. 
There is no need, as global properties have nowhere to chain up
to.
 2015-04-12 20:08:45 +02:00
Stephen Kelly 55ecd818f6 cmGlobalGenerator: Store languages as vector, not map. 
The second component of the map is never used.
 2015-04-12 20:08:42 +02:00
Kitware Robot e9e417b57c CMake Nightly Date Stamp 2015-04-12 00:01:04 -04:00
Kitware Robot 18b58b618c CMake Nightly Date Stamp 2015-04-11 00:01:13 -04:00
Brad King 74337b87ac Merge branch 'custom-command-multiple-outputs' into release 2015-04-10 16:27:55 -04:00
Brad King 9660a3ccea Makefile: Fix multiple custom command outputs with one missing 
The use of "cmake -E touch_nocreate" added in commit v3.2.1~4^2
(Makefile: Fix multiple custom command outputs regression, 2015-03-06)
caused builds to fail when one of the outputs is intentionally not
created.  This was fixed by our parent commit by making touch_nocreate
succeed when the file is missing.  Add a test case covering it.

For the Watcom WMake generator, check for the SYMBOLIC source file
property separately on each output.  The mark is needed on outputs that
are not really created to tell 'wmake' not to complain that it is
missing.  The mark is also needed on outputs that are created or 'wmake'
will not consider them out of date when they exist.

Inspired-by: Ben Boeckel <ben.boeckel@kitware.com>
 2015-04-10 16:27:42 -04:00
Gerald Combs 588dcb33b7 cmake: Provide guidance when an invalid -G option is given 
Print a list of generators if no generator or an invalid one is
supplied.

Signed-off-by: Gerald Combs <gerald@wireshark.org>
 2015-04-10 15:14:34 -04:00
Brad King 4e039a9a98 Tests: Move more command line tests into RunCMake.CommandLine 
Port most CMakeTestBadCommandLines test cases to RunCMake.CommandLine
and drop the former test.  Add validation of expected results, which was
not done by the old test.
 2015-04-10 14:56:41 -04:00
Brad King 5c08e2559c KWSys SystemTools: Teach Touch with !create to succeed on missing file 2015-04-10 12:51:10 -04:00
Brad King c9e9c31c53 Tests: Create pseudo_emulator output dir for Xcode 2.x 
Apply the workardound from commit v2.8.2~598 (Create CMakeLibTests
output dir for Xcode, 2009-12-09) to the pseudo_emulator tool.
 2015-04-10 12:42:49 -04:00
Brad King 10859b97eb Merge topic 'tar-write-format' 
6c4781ba Tests: Consolidate, refactor and extend -E tar tests
fd04d873 CTestCoverageCollectGCOV: Write tar files intended for CDash in gnutar format
d2cc5807 cmake: Teach "-E tar" command a "--format=" option
 2015-04-10 08:33:00 -04:00
Nils Gladitz 6c4781baa9 Tests: Consolidate, refactor and extend -E tar tests 2015-04-10 08:32:32 -04:00
Nils Gladitz fd04d87323 CTestCoverageCollectGCOV: Write tar files intended for CDash in gnutar format 
PHP's PharData can not currently (PHP 5.6.4) extract paxr tar archives
with long filenames.
 2015-04-10 08:32:31 -04:00
Nils Gladitz d2cc580704 cmake: Teach "-E tar" command a "--format=" option 
Allows specifying a libarchive defined archive format currently restricted to
7zip, gnutar, pax, paxr and zip.

The default is "paxr" (pax restricted).
 2015-04-10 08:32:31 -04:00
Brad King 1264c5b2c4 Merge topic 'FindCUDA.cmake/CUDA_SOURCE_FILE' 
1b0c77a3 FindCUDA: Add specific cuda_language_flag instead of using nvcc.
8313de2d FindCUDA: Allow setting CUDA_SOURCE_PROPERTY_FORMAT for non-.cu files.
 2015-04-10 08:31:03 -04:00
Brad King 8b4c40155a Merge topic 'fix-libarchive-mktemp' 
1f33b45d libarchive: Fix string concatentation in Windows mktemp implementation
 2015-04-10 08:31:01 -04:00
Brad King 4411d1d779 Merge topic 'simplify-osx-install-prefix' 
73dcba51 Simplify logic to compute install prefix in OS X CMake.app
 2015-04-10 08:30:59 -04:00
Brad King 1f3bb59b69 CTestCustom: Suppress more OS X universal binary link arch warnings 2015-04-10 08:11:21 -04:00
Kitware Robot a74d558d10 CMake Nightly Date Stamp 2015-04-10 00:01:05 -04:00
Brad King bb891710cf Merge topic 'fix-libarchive-gnutar-large-ids' 
ad194ae0 libarchive: Use base-256 encoding for UID/GID like GNU tar does
 2015-04-09 14:28:23 -04:00
Nils Gladitz ad194ae0b1 libarchive: Use base-256 encoding for UID/GID like GNU tar does 2015-04-09 14:27:16 -04:00
Brad King 0740677b9c Merge branch 'fix-libarchive-mktemp' into release 2015-04-09 14:22:44 -04:00
Brad King 048c6d1925 Merge branch 'fix-liblzma-optimize' into release 2015-04-09 14:22:05 -04:00
Brad King 0af4b40b6e liblzma: Disable GNU 3.3 compiler optimizations 
The GNU 3.3 optimizer causes bad behavior in liblzma, so disable it.
 2015-04-09 14:21:33 -04:00