summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* file: Avoid runaway DOWNLOAD/UPLOAD progress reports (#14807)Brad King2014-03-171-0/+5
| | | | | | | | 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%.
* Merge branch 'release'Brad King2014-03-170-0/+0
|\
| * Merge branch 'CONFIG-LOCATION-CMP0026' into releaseBrad King2014-03-1721-3/+117
| |\
| * \ Merge branch 'fix-Qt5-windows-build' into releaseBrad King2014-03-171-2/+6
| |\ \
| * \ \ Merge branch 'intel-14-version' into releaseBrad King2014-03-142-2/+10
| |\ \ \
| * \ \ \ Merge branch 'fix-find_dependency-empty-version' into releaseBrad King2014-03-141-2/+5
| |\ \ \ \
* | \ \ \ \ Merge topic 'target-objects-refactor'Brad King2014-03-1732-242/+338
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | cmGlobalGenerator: Make ComputeTargetObjects non-virtualStephen Kelly2014-03-1510-103/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | cmGeneratorTarget: Don't store ObjectSources for object libraries.Stephen Kelly2014-03-152-7/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Compute them on demand instead.
| * | | | | | cmLocalGenerator: Add ComputeObjectFilenames interface.Stephen Kelly2014-03-1314-69/+176
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement it in the local generators and use it in the global generators.
| * | | | | | cmGeneratorTarget: Constify cmSourceFile* in containers.Stephen Kelly2014-03-1313-75/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some of them will be used with other APIs which require value_type to be cmSourceFile const*.
| * | | | | | Constify some APIs in generators.Stephen Kelly2014-03-138-32/+36
| | | | | | |
| * | | | | | cmGeneratorTarget: Make GetSourceDepends const.Stephen Kelly2014-03-132-3/+4
| | | | | | |
| * | | | | | cmOSXBundleGenerator: Make MacOSXContentGeneratorType arg const.Stephen Kelly2014-03-135-5/+6
| | | | | | |
| * | | | | | cmGeneratorTarget: Constify the AddExplicitObjectName API.Stephen Kelly2014-03-132-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The storage is already const.
| * | | | | | cmGeneratorTarget: Constify the AddObject API.Stephen Kelly2014-03-132-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The storage is already const.
| * | | | | | cmGlobalGenerator: Extract a ComputeTargetObjectDirectory interface.Stephen Kelly2014-03-1310-23/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Make it public for future external calls.
| * | | | | | Makefiles: Compute local object files on demand.Stephen Kelly2014-03-133-24/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't compute them up front.
* | | | | | | Merge topic 'FindPkgConfig_Extend-PKG_CONFIG_PATH'Brad King2014-03-1715-8/+248
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3df51470 FindPkgConfig: Extend PKG_CONFIG_PATH using CMake variables (#12926)
| * | | | | | | FindPkgConfig: Extend PKG_CONFIG_PATH using CMake variables (#12926)Daniele E. Domenichelli2014-03-1715-8/+248
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use CMAKE_PREFIX_PATH, CMAKE_FRAMEWORK_PATH, and CMAKE_APPBUNDLE_PATH cache and environment variables to extend PKG_CONFIG_PATH before calling pkg-config. In each of the path in these variables it searches for lib/pkgconfig. Then, depending on the system, it searches for lib/${CMAKE_LIBRARY_ARCHITECTURE}/pkgconfig (debian) or for lib64/pkgconfig (other 64 bit unixes). If any of these path is found, it is appended to the PKG_CONFIG_PATH enviromnent variable. Add two new arguments to the pkg_check_module and pkg_search_module macro, NO_CMAKE_PATH and NO_CMAKE_ENVIRONMENT_PATH. The new signature are therefore: pkg_check_modules(<PREFIX> [REQUIRED] [QUIET] [NO_CMAKE_PATH] [NO_CMAKE_ENVIRONMENT_PATH] <MODULE> [<MODULE>]*) pkg_search_module(<PREFIX> [REQUIRED] [QUIET] [NO_CMAKE_PATH] [NO_CMAKE_ENVIRONMENT_PATH] <MODULE> [<MODULE>]*) By default, if CMAKE_MINIMUM_REQUIRED_VERSION is 3.1 or later (in order to keep compatibility with the previous behavior), or if PKG_CONFIG_USE_CMAKE_PREFIX_PATH is set, the CMAKE_PREFIX_PATH, CMAKE_FRAMEWORK_PATH, and CMAKE_APPBUNDLE_PATH cache and environment variables will be added to pkgconfig search path. The NO_CMAKE_PATH and NO_CMAKE_ENVIRONMENT_PATH arguments disable this behavior for the cache variables and the environment variables, respectively, similarly to the find_package() command.
* | | | | | | | Merge topic 'CONFIG-LOCATION-CMP0026'Brad King2014-03-1721-3/+117
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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)
| * | | | | | | | cmTarget: Port <CONFIG>_LOCATION support to updated string APIsStephen Kelly2014-03-171-2/+2
| | | | | | | | |
| * | | | | | | | Merge branch 'master' into CONFIG-LOCATION-CMP0026Brad King2014-03-17701-7087/+9597
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | cmTarget: Restore <CONFIG>_LOCATION to CMP0026 OLD behavior (#14808)Stephen Kelly2014-03-1721-3/+117
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | | Merge topic 'unicode-vs-projects'Brad King2014-03-1710-14/+44
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ee8cef87 Encoding: If configured, write Visual Studio project files as UTF-8. 91fd99b8 Encoding: Provide option to configure CMake to use UTF-8 encoding.
| * | | | | | | | Encoding: If configured, write Visual Studio project files as UTF-8.Clinton Stimpson2014-03-145-8/+30
| | | | | | | | |
| * | | | | | | | Encoding: Provide option to configure CMake to use UTF-8 encoding.Clinton Stimpson2014-03-145-6/+14
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge topic 'fix-Qt5-windows-build'Brad King2014-03-171-2/+6
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | 61c60b23 QtDialog: Avoid linking to Qt4 WinMain when using Qt 5.
| * | | | | | | QtDialog: Avoid linking to Qt4 WinMain when using Qt 5.Stephen Kelly2014-03-171-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | | Merge topic 'intel-14-version'Brad King2014-03-172-2/+10
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | / | | |_|_|_|_|/ | |/| | | | | eddabf9f CMake*CompilerId: Fix patch level for Intel >= 14.0 (#14806)
| * | | | | | CMake*CompilerId: Fix patch level for Intel >= 14.0 (#14806)Brad King2014-03-142-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | | | CMake Nightly Date StampKitware Robot2014-03-171-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2014-03-161-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2014-03-151-1/+1
| | | | | | |
* | | | | | | Merge topic 'cpack-deb-compression-types'Brad King2014-03-141-0/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 16caa6ec Help: Add release notes for topic 'cpack-deb-compression-types'
| * | | | | | | Help: Add release notes for topic 'cpack-deb-compression-types'Brad King2014-03-141-0/+6
| | | | | | | |
* | | | | | | | Merge topic 'ctest-intel-coverage'Brad King2014-03-143-0/+314
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3a7501d9 Help: Add release notes for topic 'ctest-intel-coverage' 9840320d CTest: Add support for Intel coverage files
| * | | | | | | | Help: Add release notes for topic 'ctest-intel-coverage'Brad King2014-03-141-0/+5
| | | | | | | | |
| * | | | | | | | CTest: Add support for Intel coverage filesVolkan Gezer2014-03-132-0/+309
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | | Merge topic 'cpack-deb-compression-types'Brad King2014-03-142-10/+49
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | 13778cd3 CPackDeb: Add option to set compression type
| * | | | | | | CPackDeb: Add option to set compression typeSean D'Epagnier2014-03-142-10/+49
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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'.
* | | | | | | Merge topic 'FeatureSummary_missing_titles'Brad King2014-03-141-0/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1af77f3f FeatureSummary: Add missing titles for PACKAGES_FOUND and PACKAGES_NOT_FOUND
| * | | | | | | FeatureSummary: Add missing titles for PACKAGES_FOUND and PACKAGES_NOT_FOUNDDaniele E. Domenichelli2014-03-141-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since now these can be used with the WHAT argument a title is required.
* | | | | | | | Merge topic 'unicode-cmake-gui'Brad King2014-03-141-2/+0
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c34216cf cmake-gui: Fix compile with Qt5 using UTF-8 internal encoding.
| * | | | | | | | cmake-gui: Fix compile with Qt5 using UTF-8 internal encoding.Clinton Stimpson2014-03-131-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | | | Merge topic 'different-python-header-libs-exe-0013794'Brad King2014-03-142-9/+22
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 59220198 FindPython*: Document suggested find_package order (#13794) a9e6de2a FindPythonInterp: Use consistent version with PythonLibs (#13794)
| * | | | | | | | | FindPython*: Document suggested find_package order (#13794)Matt McCormick2014-03-142-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document in both FindPythonInterp.cmake and FindPythonLibs.cmake that find_package(PythonInterp) should be called before find_package(PythonLibs).
| * | | | | | | | | FindPythonInterp: Use consistent version with PythonLibs (#13794)Matt McCormick2014-03-141-9/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | | | | Merge topic 'fix-find_dependency-empty-version'Brad King2014-03-1411-5/+30
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | | Tests: Check find_dependency empty extra argumentsBrad King2014-03-137-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add cases for empty arg 2 and arg 3.