summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'FindPkgConfig_Extend-PKG_CONFIG_PATH_2'Brad King2014-03-208-27/+182
|\ | | | | | | | | | | cc5a0d8f FindPkgConfig: More unit tests 453d2b24 FindPkgConfig: small refactoring
| * FindPkgConfig: More unit testsDaniele E. Domenichelli2014-03-177-3/+151
| |
| * FindPkgConfig: small refactoringDaniele E. Domenichelli2014-03-171-24/+31
| |
* | Merge topic 'CheckTypeSize_#14056'Brad King2014-03-203-3/+16
|\ \ | | | | | | | | | | | | | | | 7f857775 CheckTypeSize: Add unit test to cover the no-C case 7d6d45f2 CheckTypeSize: Support for CXX when C language is not enabled
| * | CheckTypeSize: Add unit test to cover the no-C caseDaniele E. Domenichelli2014-03-172-0/+6
| | |
| * | CheckTypeSize: Support for CXX when C language is not enabledDaniele E. Domenichelli2014-03-151-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge topic 'file-DOWNLOAD-cap-progress'Brad King2014-03-201-0/+5
|\ \ \ | | | | | | | | | | | | | | | | 413282c0 file: Avoid runaway DOWNLOAD/UPLOAD progress reports (#14807)
| * | | 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 topic 'minor_cleanups'Brad King2014-03-206-40/+21
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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'
| * | | cmMakefile: Fix style.Stephen Kelly2014-03-171-1/+1
| | | | | | | | | | | | | | | | Use this-> for member access.
| * | | cmMakefile: Fix typo in comment.Stephen Kelly2014-03-171-1/+1
| | | |
| * | | Makefiles: Remove duplicate code.Stephen Kelly2014-03-172-18/+1
| | | | | | | | | | | | | | | | | | | | The cmGlobalUnixMakefileGenerator3::ProgressMapCompare struct is logically equivalent to cmStrictTargetComparison.
| * | | cmGeneratorExpression: Remove unused include.Stephen Kelly2014-03-171-2/+0
| | | |
| * | | Rename local 'dir_max' variables to 'dir'Stephen Kelly2014-03-173-18/+18
| |/ / | | | | | | | | | | | | The code is not computing the maximum length directory, as is the case in cmLocalVisualStudioGenerator::ComputeLongestObjectDirectory.
* | | Merge topic 'fix-AllFindModules-test-module-path'Brad King2014-03-201-0/+3
|\ \ \ | | | | | | | | | | | | | | | | cf3e87e1 Tests: Teach CMakeOnly.AllFindModules to tolerate a system KDE4
| * | | Tests: Teach CMakeOnly.AllFindModules to tolerate a system KDE4Brad King2014-03-191-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The FindKDE4 module (incorrectly) modifies CMAKE_MODULE_PATH on the caller's behalf. This causes KDE4-installed find modules to be used by the test instead of those in CMake. Teach the test to restore the CMAKE_MODULE_PATH to its original value after each find_package call. This ensures that the next find_package actually tests our module.
* | | | Merge topic 'add_custom_command-DEPENDS-genex'Brad King2014-03-206-9/+66
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | bbffccca add_custom_command: Evaluate generator expressions in DEPENDS
| * | | | add_custom_command: Evaluate generator expressions in DEPENDSStephen Kelly2014-03-206-9/+66
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | Rely on evaluation in cmCustomCommandGenerator for the generators. When tracing target dependencies, depend on the union of dependencies for all configurations.
* | | | Merge topic 'Android-platform'Brad King2014-03-201-0/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 77f06b14 Modules: Add an Andriod platform file
| * | | | Modules: Add an Andriod platform fileStephen Kelly2014-03-201-0/+5
| | |_|/ | |/| | | | | | | | | | It is much like Linux but has no SONAME or RPATH.
* | | | Merge topic 'fix-out-of-date-CTestTestMemcheck'Brad King2014-03-201-1/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 84a42304 Tests: Prevent unnecessary rebuilds in CTestTestMemcheck
| * | | | Tests: Prevent unnecessary rebuilds in CTestTestMemcheckDavid Cole2014-03-201-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Repeated "cmake . && ninja" calls were resulting in rebuilds every time. Change the test so that it uses "file(WRITE" to generate a ".in" file and then configure_file to "copy if different" that ".in" file to the final generated source file. Now, rebuilds will only occur if there are changes to the generated source file on "cmake ." runs after the first one.
* | | | | Merge topic 'add_custom_command-no-INTERFACE-lib'Brad King2014-03-206-1/+23
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 2600e923 Disallow INTERFACE libraries with add_custom_command(TARGET).
| * | | | | Disallow INTERFACE libraries with add_custom_command(TARGET).Stephen Kelly2014-03-196-1/+23
| | | | | | | | | | | | | | | | | | | | | | | | Don't attempt to trace their dependencies.
* | | | | | Merge topic 'fix-Qt5-non-Windows'Brad King2014-03-201-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5f210672 QtDialog: Fix Qt 5 build on non-Windows.
| * | | | | | QtDialog: Fix Qt 5 build on non-Windows.Stephen Kelly2014-03-191-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | The Qt5Core_QTMAIN_LIBRARIES variable is defined to the Qt5::WinMain target on Windows, and undefined elsewhere.
* | | | | | CMake Nightly Date StampKitware Robot2014-03-201-1/+1
| |_|_|_|/ |/| | | |
* | | | | CMake Nightly Date StampKitware Robot2014-03-191-1/+1
| | | | |
* | | | | Merge branch 'release'Brad King2014-03-180-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | CMake 3.0.0-rc2v3.0.0-rc2Brad King2014-03-171-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2014-03-181-1/+1
| |_|_|/ |/| | |
* | | | 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.
generated by cgit v0.12 at 2025-02-08 14:55:59 (GMT)