kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
23,740 Commits 1 Branch 14 Tags
Commit Graph

15897 Commits

Author SHA1 Message Date
Brad King
06c9f55449 Merge topic 'haiku-updates' 
0cc42b87 Haiku: Fix compiler detection when using distcc
84603d80 Haiku: Enable CMake builtin ELF editor
 2014-03-26 13:24:36 -04:00
Brad King
9b536b914b Merge topic 'report-INTERFACE-type-in-conflict' 
f1fd3714 cmMakefile: Report type of INTERFACE library in conflict.
 2014-03-26 13:24:33 -04:00
Brad King
5ae8f33617 Merge topic 'update-kwsys' 
ed6ddb89 Merge branch 'upstream-kwsys' into update-kwsys
12faf00d KWSys 2014-03-19 (a8aa1014)
 2014-03-26 13:24:30 -04:00
Kitware Robot
a29ea834de CMake Nightly Date Stamp 2014-03-26 00:01:05 -04:00
Kitware Robot
a56a8f9536 CMake Nightly Date Stamp 2014-03-25 00:01:06 -04:00
Kitware Robot
8a306d68e0 CMake Nightly Date Stamp 2014-03-24 00:01:06 -04:00
Kitware Robot
6f39a6ff32 CMake Nightly Date Stamp 2014-03-23 00:01:06 -04:00
Kitware Robot
d514e41118 CMake Nightly Date Stamp 2014-03-22 00:01:05 -04:00
Adrien Destugues
84603d804c Haiku: Enable CMake builtin ELF editor 
Co-Author: Brad King <brad.king@kitware.com>
 2014-03-21 08:19:09 -04:00
Kitware Robot
6373e08d43 CMake Nightly Date Stamp 2014-03-21 00:01:16 -04:00
Stephen Kelly
f1fd3714a4 cmMakefile: Report type of INTERFACE library in conflict. 2014-03-20 22:09:32 +01:00
Brad King
ed6ddb89bf Merge branch 'upstream-kwsys' into update-kwsys 2014-03-20 09:42:27 -04:00
Brad King
d8fb08a391 Merge topic 'watcom-updates' 
64c2342a Watcom: Enable 'WMake Makefiles' generator on Linux
5d9aa66c Watcom: Introduce OpenWatcom compiler id and fix compiler version
9292d3b8 Watcom: Detect compiler target architecture and platform
fbc883c9 Watcom: Add one blank line to Makefile for better readability
 2014-03-20 09:22:30 -04:00
Brad King
565213c1fd Merge topic 'configure_file-unicode' 
98383f80 Unicode: check encoding of files given to configure_file.
 2014-03-20 09:22:28 -04:00
Brad King
c79d98b457 Merge topic 'file-DOWNLOAD-cap-progress' 
413282c0 file: Avoid runaway DOWNLOAD/UPLOAD progress reports (#14807)
 2014-03-20 09:22:21 -04:00
Brad King
9c609db988 Merge topic 'minor_cleanups' 
19012b46 cmMakefile: Fix style.
10e6f1e7 cmMakefile: Fix typo in comment.
c3a2f78b Makefiles: Remove duplicate code.
2e0611f9 cmGeneratorExpression: Remove unused include.
d83ef53a Rename local 'dir_max' variables to 'dir'
 2014-03-20 09:22:20 -04:00
Brad King
e1c1f18e39 Merge topic 'add_custom_command-DEPENDS-genex' 
bbffccca add_custom_command: Evaluate generator expressions in DEPENDS
 2014-03-20 09:22:17 -04:00
Brad King
86b003c3c6 Merge topic 'add_custom_command-no-INTERFACE-lib' 
2600e923 Disallow INTERFACE libraries with add_custom_command(TARGET).
 2014-03-20 09:22:12 -04:00
Brad King
7bf8a549f9 Merge topic 'fix-Qt5-non-Windows' 
5f210672 QtDialog: Fix Qt 5 build on non-Windows.
 2014-03-20 09:22:10 -04:00
Stephen Kelly
bbffccca42 add_custom_command: Evaluate generator expressions in DEPENDS 
Rely on evaluation in cmCustomCommandGenerator for the generators.

When tracing target dependencies, depend on the union of dependencies
for all configurations.
 2014-03-20 09:21:56 -04:00
Kitware Robot
f039a3a78e CMake Nightly Date Stamp 2014-03-20 00:01:05 -04:00
Stephen Kelly
2600e923a6 Disallow INTERFACE libraries with add_custom_command(TARGET). 
Don't attempt to trace their dependencies.
 2014-03-19 15:51:21 +01:00
Stephen Kelly
5f210672da QtDialog: Fix Qt 5 build on non-Windows. 
The Qt5Core_QTMAIN_LIBRARIES variable is defined to the Qt5::WinMain
target on Windows, and undefined elsewhere.
 2014-03-19 15:38:02 +01:00
Kitware Robot
8b8691adca CMake Nightly Date Stamp 2014-03-19 00:01:09 -04:00
Kitware Robot
2c5e78fa5d CMake Nightly Date Stamp 2014-03-18 00:01:09 -04:00
Clinton Stimpson
98383f802a Unicode: check encoding of files given to configure_file. 
UTF-16 and UTF-32 files are rejected.
 2014-03-17 14:01:55 -06:00
Jiri Malak
64c2342a8d Watcom: Enable 'WMake Makefiles' generator on Linux 2014-03-17 15:04:05 -04:00
Jiri Malak
5d9aa66c91 Watcom: Introduce OpenWatcom compiler id and fix compiler version 
Distinguish "Open Watcom" from old "Watcom" by introducing a new
"OpenWatcom" compiler id.  The __WATCOMC__ format is "VVRP" for Watcom
and "VVRP + 1100" for Open Watcom.
 2014-03-17 15:00:59 -04:00
Brad King
0f4e8fd0e9 CMake 3.0.0-rc2 2014-03-17 13:14:27 -04:00
Brad King
413282c0cf file: Avoid runaway DOWNLOAD/UPLOAD progress reports (#14807) 
Curl makes progress callbacks frequently but we round to the nearest
percent and report only when that changes so that we make at most 101
progress reports.  However, when unexpected data beyond the total are
transferred the progress can get beyond 100% and lead to unlimited
reports.  Avoid this case by capping the reported progress to 100%.
 2014-03-17 11:05:34 -04:00
Stephen Kelly
19012b4652 cmMakefile: Fix style. 
Use this-> for member access.
 2014-03-17 15:34:53 +01:00
Stephen Kelly
10e6f1e716 cmMakefile: Fix typo in comment. 2014-03-17 15:33:54 +01:00
Stephen Kelly
c3a2f78b5a Makefiles: Remove duplicate code. 
The cmGlobalUnixMakefileGenerator3::ProgressMapCompare struct is
logically equivalent to cmStrictTargetComparison.
 2014-03-17 15:32:19 +01:00
Stephen Kelly
2e0611f981 cmGeneratorExpression: Remove unused include. 2014-03-17 15:29:49 +01:00
Stephen Kelly
d83ef53a12 Rename local 'dir_max' variables to 'dir' 
The code is not computing the maximum length directory, as is the
case in cmLocalVisualStudioGenerator::ComputeLongestObjectDirectory.
 2014-03-17 15:27:01 +01:00
Jiri Malak
fbc883c942 Watcom: Add one blank line to Makefile for better readability 2014-03-17 10:23:52 -04:00
Brad King
b16f26f5f9 Merge topic 'target-objects-refactor' 
6c9dd0ec cmGlobalGenerator: Make ComputeTargetObjects non-virtual
c481fadc cmGeneratorTarget: Don't store ObjectSources for object libraries.
f6da0440 cmLocalGenerator: Add ComputeObjectFilenames interface.
9ad804ac cmGeneratorTarget: Constify cmSourceFile* in containers.
c725bb3c Constify some APIs in generators.
dcfcd23e cmGeneratorTarget: Make GetSourceDepends const.
04cf50ff cmOSXBundleGenerator: Make MacOSXContentGeneratorType arg const.
6132d979 cmGeneratorTarget: Constify the AddExplicitObjectName API.
bc512211 cmGeneratorTarget: Constify the AddObject API.
cd43433d cmGlobalGenerator: Extract a ComputeTargetObjectDirectory interface.
d5b2e33b Makefiles: Compute local object files on demand.
 2014-03-17 10:00:43 -04:00
Brad King
6aaaa6d0bd Merge topic 'CONFIG-LOCATION-CMP0026' 
ea17a03b cmTarget: Port <CONFIG>_LOCATION support to updated string APIs
6e466c6f Merge branch 'master' into CONFIG-LOCATION-CMP0026
c903b531 cmTarget: Restore <CONFIG>_LOCATION to CMP0026 OLD behavior (#14808)
 2014-03-17 09:49:56 -04:00
Brad King
5a21cbc96b Merge topic 'unicode-vs-projects' 
ee8cef87 Encoding: If configured, write Visual Studio project files as UTF-8.
91fd99b8 Encoding: Provide option to configure CMake to use UTF-8 encoding.
 2014-03-17 09:49:54 -04:00
Brad King
223b05a80c Merge topic 'fix-Qt5-windows-build' 
61c60b23 QtDialog: Avoid linking to Qt4 WinMain when using Qt 5.
 2014-03-17 09:49:52 -04:00
Brad King
4a7eb0cdec Merge branch 'CONFIG-LOCATION-CMP0026' into release 2014-03-17 09:35:30 -04:00
Stephen Kelly
ea17a03be5 cmTarget: Port <CONFIG>_LOCATION support to updated string APIs 2014-03-17 09:31:58 -04:00
Brad King
6e466c6f2e Merge branch 'master' into CONFIG-LOCATION-CMP0026 2014-03-17 09:31:21 -04:00
Stephen Kelly
c903b5319b cmTarget: Restore <CONFIG>_LOCATION to CMP0026 OLD behavior (#14808) 
Restore support for the undocumented <CONFIG>_LOCATION target property
removed by commit v3.0.0-rc1~175^2 (cmTarget: Remove support for
<CONFIG>_LOCATION property, 2013-12-30) as part of the CMP0026 OLD
behavior.
 2014-03-17 09:30:39 -04:00
Brad King
43b39b1c36 Merge branch 'fix-Qt5-windows-build' into release 2014-03-17 09:24:12 -04:00
Stephen Kelly
61c60b239c QtDialog: Avoid linking to Qt4 WinMain when using Qt 5. 
Override the QT_QTMAIN_LIBRARY cache variable with a regular
variable in the Qt 5 configuration. This avoids linking with the
Qt 4 version of the WinMain library.
 2014-03-17 14:15:14 +01:00
Kitware Robot
6313be44aa CMake Nightly Date Stamp 2014-03-17 00:01:05 -04:00
Kitware Robot
2eb158caf0 CMake Nightly Date Stamp 2014-03-16 00:01:05 -04:00
Stephen Kelly
6c9dd0ec7b cmGlobalGenerator: Make ComputeTargetObjects non-virtual 
Implement it in terms of the ComputeObjectFilenames virtual method
on the local generators.

Remove the reimplementation from the global generators which are
now all functionally identical.
 2014-03-15 09:30:24 +01:00
Stephen Kelly
c481fadc07 cmGeneratorTarget: Don't store ObjectSources for object libraries. 
Compute them on demand instead.
 2014-03-15 09:29:44 +01:00