Brad King
86b003c3c6
Merge topic 'add_custom_command-no-INTERFACE-lib'
...
2600e923
2014-03-20 09:22:12 -04:00
Brad King
7bf8a549f9
Merge topic 'fix-Qt5-non-Windows'
...
5f210672
2014-03-20 09:22:10 -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
Brad King
0f4e8fd0e9
CMake 3.0.0-rc2
2014-03-17 13:14:27 -04:00
Brad King
b16f26f5f9
Merge topic 'target-objects-refactor'
...
6c9dd0ecc481fadcf6da04409ad804acc725bb3cdcfcd23e04cf50ff6132d979bc512211cd43433dd5b2e33b
2014-03-17 10:00:43 -04:00
Brad King
6aaaa6d0bd
Merge topic 'CONFIG-LOCATION-CMP0026'
...
ea17a03b6e466c6fc903b531#14808 )
2014-03-17 09:49:56 -04:00
Brad King
5a21cbc96b
Merge topic 'unicode-vs-projects'
...
ee8cef8791fd99b8
2014-03-17 09:49:54 -04:00
Brad King
223b05a80c
Merge topic 'fix-Qt5-windows-build'
...
61c60b23
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
Kitware Robot
3c6943eb9d
CMake Nightly Date Stamp
2014-03-15 00:01:11 -04:00
Clinton Stimpson
ee8cef8725
Encoding: If configured, write Visual Studio project files as UTF-8.
2014-03-14 08:48:42 -06:00
Clinton Stimpson
91fd99b865
Encoding: Provide option to configure CMake to use UTF-8 encoding.
2014-03-14 08:48:18 -06:00
Brad King
3d89b36415
Merge topic 'ctest-intel-coverage'
...
3a7501d99840320d
2014-03-14 10:35:42 -04:00
Brad King
dafa80ecc0
Merge topic 'cpack-deb-compression-types'
...
13778cd3
2014-03-14 09:30:29 -04:00
Brad King
67a0d5e4c4
Merge topic 'unicode-cmake-gui'
...
c34216cf
2014-03-14 09:30:26 -04:00
Sean D'Epagnier
13778cd3be
CPackDeb: Add option to set compression type
...
Add a CPACK_DEBIAN_COMPRESSION_TYPE option to set the compression type.
Default to 'gzip' to preserve existing behavior. Use "cmake -E tar"
for 'gzip', 'bzip2', and 'none'. Use system "tar" for 'lzma' and 'xz'.
2014-03-14 09:29:54 -04:00
Kitware Robot
9a026b902b
CMake Nightly Date Stamp
2014-03-14 00:01:14 -04:00
Volkan Gezer
9840320dff
CTest: Add support for Intel coverage files
...
By default, Intel compiler coverage tools generate HTML files as
reports, but the option -txtlcov can be given to codecov to output a
coverage file with LCov format.
To use Intel coverage:
* build the project with coverage flags
* run the application
* run profmerge
* run codecov
The output file will be "build_dir/CodeCoverage/SRCFILEDIR.LCOV".
Ask users to compile with -prof-dir${BUILD_DIR} instead of searching
the entire build tree recursively to find coverage files.
2014-03-13 16:18:10 -04:00
Stephen Kelly
f6da044080
cmLocalGenerator: Add ComputeObjectFilenames interface.
...
Implement it in the local generators and use it in the global
generators.
2014-03-13 15:28:02 +01:00
Stephen Kelly
9ad804ac7b
cmGeneratorTarget: Constify cmSourceFile* in containers.
...
Some of them will be used with other APIs which require value_type
to be cmSourceFile const*.
2014-03-13 15:27:23 +01:00
Stephen Kelly
c725bb3cbd
Constify some APIs in generators.
2014-03-13 15:27:23 +01:00
Stephen Kelly
dcfcd23ed5
cmGeneratorTarget: Make GetSourceDepends const.
2014-03-13 15:27:23 +01:00
Stephen Kelly
04cf50ff62
cmOSXBundleGenerator: Make MacOSXContentGeneratorType arg const.
2014-03-13 15:27:23 +01:00
Stephen Kelly
6132d979d9
cmGeneratorTarget: Constify the AddExplicitObjectName API.
...
The storage is already const.
2014-03-13 15:27:23 +01:00
Stephen Kelly
bc51221164
cmGeneratorTarget: Constify the AddObject API.
...
The storage is already const.
2014-03-13 15:27:23 +01:00
Stephen Kelly
cd43433de5
cmGlobalGenerator: Extract a ComputeTargetObjectDirectory interface.
...
Make it public for future external calls.
2014-03-13 15:27:23 +01:00
Stephen Kelly
d5b2e33be2
Makefiles: Compute local object files on demand.
...
Don't compute them up front.
2014-03-13 15:27:23 +01:00
Brad King
7477f01ebd
Merge topic 'generalize-cmCustomCommandGenerator'
...
bc993f279a5c5544d45e7f34
2014-03-13 09:36:10 -04:00
Brad King
5ef2bb4b86
Merge topic 'string-apis-fix-cmake-gui'
...
ae32622b#14804 )
2014-03-13 09:36:08 -04:00
Brad King
e1a671c7d8
Merge topic 'fix-CMP0046-warning'
...
d83245a3
2014-03-13 09:36:06 -04:00
Kitware Robot
4a6a59a120
CMake Nightly Date Stamp
2014-03-13 00:01:10 -04:00
Clinton Stimpson
c34216cf8a
cmake-gui: Fix compile with Qt5 using UTF-8 internal encoding.
...
Because we already call [to|from]Local8Bit() with C strings where we are supposed to,
we do not need to specify UTF-8 encoding when converting C strings to QString.
2014-03-12 20:48:46 -06:00
Stephen Kelly
d83245a34f
cmTarget: Don't create duplicate backtraces in CMP0046 warning
2014-03-12 18:01:26 +01:00
Brad King
bc993f277e
Generalize cmCustomCommandGenerator to more fields
...
Until now the cmCustomCommandGenerator was used only to compute the
command lines of a custom command. Generalize it to get the comment,
working directory, dependencies, and outputs of custom commands. Update
use in all generators to support this.
2014-03-12 10:44:01 -04:00
Brad King
9a5c554414
cmGlobalXCodeGenerator: Simplify handling of multiple outputs
...
Make the multiple output pair map more local. Generate it where we
have the current configuration available.
2014-03-12 10:44:00 -04:00
Brad King
d45e7f3461
cmCustomCommand: Return std::string from GetWorkingDirectory
2014-03-12 10:44:00 -04:00
Brad King
cb8f87f622
Merge topic 'remove-c_str-calls'
...
3be265b3af8a164321c573f6
2014-03-12 10:42:38 -04:00
