Kitware Robot
521b930bf4
CMake Nightly Date Stamp
2014-03-31 00:01:05 -04:00
Kitware Robot
9298987a82
CMake Nightly Date Stamp
2014-03-30 00:01:06 -04:00
Kitware Robot
5bad8ae342
CMake Nightly Date Stamp
2014-03-29 00:01:05 -04:00
Kitware Robot
cab2e31443
CMake Nightly Date Stamp
2014-03-28 00:01:05 -04:00
Brad King
ede0419a37
Merge topic 'osx-CFBundle-info-plist'
...
90e22f8f
OS X: Fix Info.plist placement in a CFBundle
2014-03-27 11:12:10 -04:00
Kitware Robot
e03ac807cf
CMake Nightly Date Stamp
2014-03-27 00:01:18 -04:00
Brad King
edb506b862
Merge topic 'fix-Qt-Autogen'
...
71a11252
QtAutogen: Fix use of multiple ui files in a single target.
261acd91
QtAutogen: Use the basename for resource files.
2014-03-26 13:24:43 -04:00
Brad King
a11d1c6135
Merge topic 'dev/custom-ninja-deptypes'
...
9523d2a5
ninja: Add support for custom depfile formats
2014-03-26 13:24:39 -04:00
Brad King
f04e217cc1
Merge topic 'remove-CMakeFiles-advice'
...
bccc056b
cmake: Advise user to remove CMakeFiles with CMakeCache.txt (#14820 )
2014-03-26 13:24:37 -04:00
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
Tim Blechmann
90e22f8f71
OS X: Fix Info.plist placement in a CFBundle
...
Fix cmOSXBundleGenerator::CreateCFBundle to place Info.plist under the
same root directory as the rest of the bundle. Without this, Info.plist
was placed into CMAKE_BINARY_DIR, not CMAKE_CURRENT_BINARY_DIR because
the target path was not generated correctly.
2014-03-26 10:52:23 -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
Stephen Kelly
71a11252e9
QtAutogen: Fix use of multiple ui files in a single target.
...
Don't store a mapping of the directory to the ui file. The directory
will be a unique key, allowing only one ui file to be specified.
Use the source file name instead as the mapping key.
2014-03-25 01:39:03 +01:00
Stephen Kelly
261acd9109
QtAutogen: Use the basename for resource files.
...
The rcc tool generates a cpp file with a symbol called qInitResources
or called qInitResources_${name}, if the name is passed. The
qInitResources symbol clashes if multiple qrc files are used in
one target.
Always pass the name to ensure that the symbol is unique. This is also
the behavior of the qtx_add_resource macros.
2014-03-25 01:16:49 +01:00
Kitware Robot
8a306d68e0
CMake Nightly Date Stamp
2014-03-24 00:01:06 -04:00
Ben Boeckel
9523d2a55c
ninja: Add support for custom depfile formats
...
Not everything that isn't MSVC is GCC. I have support for LDC's depfile
format on its way upstream[1], but its future is uncertain. CMake should
at least support this for future depfile formats.
[1]https://github.com/martine/ninja/pull/721
2014-03-23 23:54:13 -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
Brad King
bccc056ba8
cmake: Advise user to remove CMakeFiles with CMakeCache.txt ( #14820 )
2014-03-21 08:28:37 -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
Brad King
6a85d624a8
Merge branch 'add_custom_command-no-INTERFACE-lib' into release
2014-03-19 10:57:04 -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