Commit Graph

24512 Commits

Author SHA1 Message Date
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
Daniele E. Domenichelli 7d6d45f23c CheckTypeSize: Support for CXX when C language is not enabled
This example now works without need to enable C language:

  cmake_minimum_required(VERSION x.x.x)
  project(foo CXX)
  include(CheckTypeSize)
  check_type_size("short" SIZEOF_SHORT LANGUAGE CXX)

Fixes #14056
2014-03-15 23:23:53 +01: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 7fba4552fc Merge topic 'cpack-deb-compression-types'
16caa6ec Help: Add release notes for topic 'cpack-deb-compression-types'
2014-03-14 10:36:05 -04:00
Brad King 3d89b36415 Merge topic 'ctest-intel-coverage'
3a7501d9 Help: Add release notes for topic 'ctest-intel-coverage'
9840320d CTest: Add support for Intel coverage files
2014-03-14 10:35:42 -04:00
Brad King 3a7501d9eb Help: Add release notes for topic 'ctest-intel-coverage' 2014-03-14 10:31:30 -04:00
Brad King aa195cdcbe Merge branch 'intel-14-version' into release 2014-03-14 10:00:16 -04:00
Brad King 967d09fec3 Merge branch 'fix-find_dependency-empty-version' into release 2014-03-14 09:59:52 -04:00
Brad King 16caa6ecba Help: Add release notes for topic 'cpack-deb-compression-types' 2014-03-14 09:34:14 -04:00
Brad King dafa80ecc0 Merge topic 'cpack-deb-compression-types'
13778cd3 CPackDeb: Add option to set compression type
2014-03-14 09:30:29 -04:00
Brad King 76845bdbf4 Merge topic 'FeatureSummary_missing_titles'
1af77f3f FeatureSummary: Add missing titles for PACKAGES_FOUND and PACKAGES_NOT_FOUND
2014-03-14 09:30:28 -04:00
Brad King 67a0d5e4c4 Merge topic 'unicode-cmake-gui'
c34216cf cmake-gui: Fix compile with Qt5 using UTF-8 internal encoding.
2014-03-14 09:30:26 -04:00
Brad King 92b423fc2f Merge topic 'different-python-header-libs-exe-0013794'
59220198 FindPython*: Document suggested find_package order (#13794)
a9e6de2a FindPythonInterp: Use consistent version with PythonLibs (#13794)
2014-03-14 09:30:24 -04:00
Brad King 32b7d2ed8a Merge topic 'fix-find_dependency-empty-version'
a25b809f Tests: Check find_dependency empty extra arguments
9914e7cd Merge branch 'fix-find_dependency-empty-version'
34cd5fc4 find_dependency: Give more helpful message if VERSION is empty
d363cbf3 Tests: Make RunCMake.find_dependency tolerate line number changes
2014-03-14 09:30:23 -04:00
Brad King e623605ed6 Merge topic 'doc-cmake-developer-no-cmStdString'
328c2179 Help: Drop cmStdString from cmake-developer(7) examples
2014-03-14 09:30:21 -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
Matt McCormick 5922019802 FindPython*: Document suggested find_package order (#13794)
Document in both FindPythonInterp.cmake and FindPythonLibs.cmake that
find_package(PythonInterp) should be called before find_package(PythonLibs).
2014-03-14 09:11:26 -04:00
Matt McCormick a9e6de2acc FindPythonInterp: Use consistent version with PythonLibs (#13794)
If

  find_package(PythonLibs)
  find_package(PythonInterp)

is called, help PythonInterp to get a version of PYTHON_EXECUTABLE
consistent with the library versions found by PythonLibs.
2014-03-14 09:09:58 -04:00
Brad King eddabf9fcf CMake*CompilerId: Fix patch level for Intel >= 14.0 (#14806)
According to the Intel release notes:

 http://software.intel.com/sites/default/files/l-compiler-release-update.pdf

the __INTEL_COMPILER_UPDATE predefined macro was introduced to hold the
third version component.

Reported-by: Dirk Ribbrock <dirk.ribbrock@mathematik.uni-dortmund.de>
Co-Author: Rolf Eike Beer <kde@opensource.sf-tec.de>
2014-03-14 08:51:37 -04:00
Daniele E. Domenichelli 1af77f3f1d FeatureSummary: Add missing titles for PACKAGES_FOUND and PACKAGES_NOT_FOUND
Since now these can be used with the WHAT argument a title is required.
2014-03-14 11:51:51 +01: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
Brad King a25b809f20 Tests: Check find_dependency empty extra arguments
Add cases for empty arg 2 and arg 3.
2014-03-13 15:57:03 -04:00
Brad King 9914e7cd95 Merge branch 'fix-find_dependency-empty-version' 2014-03-13 15:56:48 -04:00
Aurélien Gâteau 34cd5fc451 find_dependency: Give more helpful message if VERSION is empty 2014-03-13 15:51:11 -04:00
Brad King d363cbf315 Tests: Make RunCMake.find_dependency tolerate line number changes 2014-03-13 15:47:08 -04:00
Brad King 328c217960 Help: Drop cmStdString from cmake-developer(7) examples
The type no longer exists within CMake.
2014-03-13 15:11:22 -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 82a7d54cfe Merge branch 'release' 2014-03-13 09:41:03 -04:00
Brad King 7477f01ebd Merge topic 'generalize-cmCustomCommandGenerator'
bc993f27 Generalize cmCustomCommandGenerator to more fields
9a5c5544 cmGlobalXCodeGenerator: Simplify handling of multiple outputs
d45e7f34 cmCustomCommand: Return std::string from GetWorkingDirectory
2014-03-13 09:36:10 -04:00
Brad King 5ef2bb4b86 Merge topic 'string-apis-fix-cmake-gui'
ae32622b cmake-gui: Fix handling of missing CMAKE_EXTRA_GENERATOR (#14804)
2014-03-13 09:36:08 -04:00
Brad King e1a671c7d8 Merge topic 'fix-CMP0046-warning'
d83245a3 cmTarget: Don't create duplicate backtraces in CMP0046 warning
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