summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'rm-Makefile-LocalGenerator'Brad King2015-08-117-19/+18
|\ | | | | | | | | | | 1689c91d cmMakefile: Remove unused method. dd11f72c cmGlobalGenerator: Base exclusion computation on cmGeneratorTarget.
| * cmMakefile: Remove unused method.Stephen Kelly2015-08-061-4/+0
| |
| * cmGlobalGenerator: Base exclusion computation on cmGeneratorTarget.Stephen Kelly2015-08-066-15/+18
| |
* | CMake Nightly Date StampKitware Robot2015-08-111-1/+1
| |
* | Merge topic 'ninja-version-handling'Brad King2015-08-103-12/+25
|\ \ | | | | | | | | | | | | | | | 874e70bc Ninja: Prevent generating if installed Ninja version is too old. c5ac2b9d Ninja: Centralized required Ninja version numbers and comparisons.
| * | Ninja: Prevent generating if installed Ninja version is too old.James Johnston2015-08-091-0/+12
| | |
| * | Ninja: Centralized required Ninja version numbers and comparisons.James Johnston2015-08-093-12/+13
| | |
* | | Merge topic 'fix-process-error-handling'Brad King2015-08-103-12/+42
|\ \ \ | | | | | | | | | | | | | | | | | | | | 203b20df cmcmd: Improve error handling when executing a process. b28b07db cmCTestCoverageHandle: Improve error handling.
| * | | cmcmd: Improve error handling when executing a process.James Johnston2015-08-081-5/+14
| | | |
| * | | cmCTestCoverageHandle: Improve error handling.James Johnston2015-08-082-7/+28
| | | |
* | | | Merge topic 'fix-get-filename-component'Brad King2015-08-103-3/+80
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d035e968 get_filename_component: Fix bug where CACHE was ignored. 38ed5866 get_filename_component: Added initial tests for PROGRAM component. 772ca69f get_filename_component: Tests now check for proper CACHE usage.
| * | | | get_filename_component: Fix bug where CACHE was ignored.James Johnston2015-08-062-2/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If PROGRAM_ARGS is provided to get_filename_component, fix bug where the command failed to honor the CACHE argument. Added test cases to RunCMake.get_filename_component that fail when the bug is not fixed to prevent regressions. Signed-off-by: James Johnston <johnstonj.public@codenest.com>
| * | | | get_filename_component: Added initial tests for PROGRAM component.James Johnston2015-08-061-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The RunCMake.get_filename_component test now tests basic functionality of the PROGRAM component argument of get_filename_component. Signed-off-by: James Johnston <johnstonj.public@codenest.com>
| * | | | get_filename_component: Tests now check for proper CACHE usage.James Johnston2015-08-062-1/+34
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | The RunCMake.get_filename_component test was improved to assert that each test variable outputted by get_filename_component is or is not a cache variable, as per the particular test. Signed-off-by: James Johnston <johnstonj.public@codenest.com>
* | | | Merge topic 'change-nmake-env-warning'Brad King2015-08-1012-26/+192
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | afeb4eb2 nmake/jom: Only warn about bad VS environment if compiler not found.
| * | | | nmake/jom: Only warn about bad VS environment if compiler not found.James Johnston2015-08-0612-26/+192
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | nmake and jom generators no longer warn about missing INCLUDE/LIB environment variables unless the C/CXX compiler cannot be found. This is useful if the user does not want to use these generators with the Visual C++ compiler, or they do not want to enable any language.
* | | | Merge topic 'fix-TARGET_FILE-imported'Brad King2015-08-106-0/+20
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 35aab9df Reject TARGET_PDB_FILE for imported targets instead of crashing
| * | | | Reject TARGET_PDB_FILE for imported targets instead of crashingBrad King2015-08-066-0/+20
| |/ / / | | | | | | | | | | | | Reported-by: Justin Borodinsky <justin.borodinsky@gmail.com>
* | | | CMake Nightly Date StampKitware Robot2015-08-101-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2015-08-091-1/+1
| |_|/ |/| |
* | | CMake Nightly Date StampKitware Robot2015-08-081-1/+1
| |/ |/|
* | CMake Nightly Date StampKitware Robot2015-08-071-1/+1
|/
* Merge topic 'cpack-rpm-documentation-fixes'Brad King2015-08-0612-2/+228
|\ | | | | | | | | | | | | | | | | | | 94226751 Tests/RunCMake/CPack: Add dependencies tests 105011e0 Tests/RunCMake/CPack: Bump verify result cmake version d882d477 Tests/RunCMake/CPack/DEB: Add getPackageInfo helper function 145735b7 Tests/RunCMake/CPack: Enable CXX language in tests e26f53a8 CPack/RPM: missing PACKAGE_CONFLICTS documentation 64aacb24 CPack/RPM: undocumented variables
| * Tests/RunCMake/CPack: Add dependencies testsDomen Vrankar2015-08-068-0/+143
| | | | | | | | | | Add tests for RPM and DEB package test for currently supported dependency features (requires, provides, conflicts, ...).
| * Tests/RunCMake/CPack: Bump verify result cmake versionDomen Vrankar2015-08-061-1/+1
| | | | | | | | | | Bumped version to current cmake version so that we always use latest policies.
| * Tests/RunCMake/CPack/DEB: Add getPackageInfo helper functionDomen Vrankar2015-08-061-0/+10
| | | | | | | | | | getPackageInfo helper function returns package info for provided deb package file
| * Tests/RunCMake/CPack: Enable CXX language in testsDomen Vrankar2015-08-061-1/+1
| | | | | | | | | | Enable CXX language for CPack tests so that they may compile binaries if needed.
| * CPack/RPM: missing PACKAGE_CONFLICTS documentationFrank-Christian Otto2015-08-041-0/+17
| |
| * CPack/RPM: undocumented variablesDomen Vrankar2015-08-041-0/+56
| | | | | | | | | | | | Some CPack/RPM variables were undocumented even though they are implemented in code for quite a while now.
* | Merge topic 'ninja-LINK_DEPENDS'Brad King2015-08-062-1/+10
|\ \ | | | | | | | | | | | | 43c94281 Ninja: Honor the LINK_DEPENDS target property (#14796)
| * | Ninja: Honor the LINK_DEPENDS target property (#14796)Brad King2015-08-052-1/+10
| | |
* | | Merge topic 'install-no-runtime-deps-by-default'Brad King2015-08-067-1/+7
|\ \ \ | | | | | | | | | | | | | | | | 26f5445b Do not install 3rd-party dependencies by default
| * | | Do not install 3rd-party dependencies by defaultBrad King2015-08-057-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable the CMake_INSTALL_DEPENDENCIES option by default and turn it on explicitly in our packaging scripts. This simplifies packaging in distributions that provide the dependencies for us without having to install them. We only need 3rd-party runtime dependencies to be installed for packaging with redistributable binaries.
* | | | Merge topic 'use-generator-target'Brad King2015-08-0638-2393/+2463
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a309409e cmOrderDirectories: Port to cmGeneratorTarget. f83e8402 cmGeneratorTarget: Move CompileInfoMap from cmTarget. b3f0e353 cmGeneratorTarget: Move GetCompilePDBDirectory from cmTarget. 34c43741 cmGeneratorTarget: Move GetOutputName from cmTarget. 4329a71c cmComputeLinkDepends: Port to cmGeneratorTarget. c93230ac cmComputeLinkInformation: Port to cmGeneratorTarget. ee26add4 cmGeneratorTarget: Move IsBundleOnApple from cmTarget. c8a5f5ae cmMakefileTargetGenerator: Add accessor for GeneratorTarget. f8076644 cmGeneratorTarget: Move GetLinkClosure from cmTarget. 7c809fa2 cmGeneratorTarget: Move GetLinkerLanguage from cmTarget. 6da99de3 cmGeneratorTarget: Move GetFrameworkDirectory from cmTarget. d6bb319b cmGeneratorTarget: Move GetFullName from cmTarget. 7a460852 cmGeneratorTarget: Move GetAppBundleDirectory from cmTarget. d560bfd2 cmGeneratorTarget: Move GetInstallNameDir* from cmTarget. 89e2a080 cmGeneratorTarget: Move GetMacContentDirectory from cmTarget. 62720e44 cmGeneratorTarget: Move GetFullNameComponents from cmTarget. ...
| * | | | cmOrderDirectories: Port to cmGeneratorTarget.Stephen Kelly2015-08-053-9/+11
| | | | |
| * | | | cmGeneratorTarget: Move CompileInfoMap from cmTarget.Stephen Kelly2015-08-054-50/+51
| | | | |
| * | | | cmGeneratorTarget: Move GetCompilePDBDirectory from cmTarget.Stephen Kelly2015-08-056-26/+24
| | | | |
| * | | | cmGeneratorTarget: Move GetOutputName from cmTarget.Stephen Kelly2015-08-054-55/+55
| | | | |
| * | | | cmComputeLinkDepends: Port to cmGeneratorTarget.Stephen Kelly2015-08-053-11/+14
| | | | |
| * | | | cmComputeLinkInformation: Port to cmGeneratorTarget.Stephen Kelly2015-08-053-47/+44
| | | | |
| * | | | cmGeneratorTarget: Move IsBundleOnApple from cmTarget.Stephen Kelly2015-08-056-13/+14
| | | | |
| * | | | cmMakefileTargetGenerator: Add accessor for GeneratorTarget.Stephen Kelly2015-08-051-0/+1
| | | | |
| * | | | cmGeneratorTarget: Move GetLinkClosure from cmTarget.Stephen Kelly2015-08-056-238/+255
| | | | |
| * | | | cmGeneratorTarget: Move GetLinkerLanguage from cmTarget.Stephen Kelly2015-08-0516-50/+54
| | | | |
| * | | | cmGeneratorTarget: Move GetFrameworkDirectory from cmTarget.Stephen Kelly2015-08-055-56/+57
| | | | |
| * | | | cmGeneratorTarget: Move GetFullName from cmTarget.Stephen Kelly2015-08-058-195/+201
| | | | | | | | | | | | | | | | | | | | Bring GetFullNameInternal with it.
| * | | | cmGeneratorTarget: Move GetAppBundleDirectory from cmTarget.Stephen Kelly2015-08-055-18/+20
| | | | |
| * | | | cmGeneratorTarget: Move GetInstallNameDir* from cmTarget.Stephen Kelly2015-08-0516-94/+100
| | | | |
| * | | | cmGeneratorTarget: Move GetMacContentDirectory from cmTarget.Stephen Kelly2015-08-055-50/+53
| | | | |
| * | | | cmGeneratorTarget: Move GetFullNameComponents from cmTarget.Stephen Kelly2015-08-056-15/+17
| | | | |