summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'bootstrap-no-ninja'Brad King2015-08-112-6/+5
|\ | | | | | | | | 4e3c7725 bootstrap: Do not build Ninja generator
| * bootstrap: Do not build Ninja generatorBrad King2015-08-102-6/+5
| | | | | | | | | | The CMake bootstrap process uses Makefile generators so there is no need to build the Ninja generators during bootstrap.
* | Merge topic 'global-generator-makefiles'Brad King2015-08-1110-61/+72
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6d8a125e cmQtAutoGenerators: Prefer a generator to access global generator. 5f66900e cmGlobalGenerator: Port Find API to cmMakefile. c5b8841f cmGlobalGenerator: Create global targets from cmMakefiles. 8f75ea3b cmGlobalGenerator: Port global target creation to cmMakefile. 56f0540b cmGlobalGenerator: Port Configure-time check to cmMakefile. 19b546ef cmGlobalGenerator: Base final target property computation on Makefiles. f8be9ba9 cmGlobalGenerator: Base progress on Makefiles, not LocalGenerators. bc1097e3 cmExportLibraryDependenciesCommand: Port to cmMakefile. 204aecdf cmGlobalGenerator: Port configure-time code to cmMakefile. 3dd6f0a5 cmake: Port configure-time code to cmMakefile. 73e4df99 cmGlobalGenerator: Store a container of cmMakefiles. 19369937 cmGeneratorTarget: Port internal type to cmGeneratorTarget. 32f131b0 cmGeneratorTarget: Prefer the local generator to access the global.
| * | cmQtAutoGenerators: Prefer a generator to access global generator.Stephen Kelly2015-08-071-2/+2
| | |
| * | cmGlobalGenerator: Port Find API to cmMakefile.Stephen Kelly2015-08-075-20/+21
| | |
| * | cmGlobalGenerator: Create global targets from cmMakefiles.Stephen Kelly2015-08-071-2/+2
| | |
| * | cmGlobalGenerator: Port global target creation to cmMakefile.Stephen Kelly2015-08-071-1/+1
| | |
| * | cmGlobalGenerator: Port Configure-time check to cmMakefile.Stephen Kelly2015-08-071-6/+5
| | | | | | | | | | | | This uses no generate-time state.
| * | cmGlobalGenerator: Base final target property computation on Makefiles.Stephen Kelly2015-08-071-2/+2
| | |
| * | cmGlobalGenerator: Base progress on Makefiles, not LocalGenerators.Stephen Kelly2015-08-071-13/+13
| | |
| * | cmExportLibraryDependenciesCommand: Port to cmMakefile.Stephen Kelly2015-08-071-5/+3
| | |
| * | cmGlobalGenerator: Port configure-time code to cmMakefile.Stephen Kelly2015-08-071-3/+3
| | |
| * | cmake: Port configure-time code to cmMakefile.Stephen Kelly2015-08-071-1/+1
| | |
| * | cmGlobalGenerator: Store a container of cmMakefiles.Stephen Kelly2015-08-073-0/+14
| | | | | | | | | | | | For use at configure-time.
| * | cmGeneratorTarget: Port internal type to cmGeneratorTarget.Stephen Kelly2015-08-071-6/+6
| | |
| * | cmGeneratorTarget: Prefer the local generator to access the global.Stephen Kelly2015-08-071-4/+3
| | |
* | | Merge topic 'use-generator-target'Brad King2015-08-1112-167/+212
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 29886ce7 cmTarget: Use a simpler delete algorithm. 197f4de1 cmTarget: Split storage of compile definitions from genexes. 44e071ae cmTarget: Split storage of compile features from genexes. 772ecef4 cmTarget: Split storage of compile options from genexes. 1f54bc1c cmTarget: Split storage of include directories from genexes. 7568199b cmTarget: Request only the link libraries where needed. 10040601 cmLinkImplementationLibraries: Move to namespace scope. d9da6ee2 cmLinkItem: Split to separate file. 27252b24 cmComputeLinkInformation: Simplify generator object access.
| * | | cmTarget: Use a simpler delete algorithm.Stephen Kelly2015-08-071-13/+5
| | | | | | | | | | | | | | | | | | | | | | | | This way, the methods can be moved without requiring a local algorithm. The containers use automatic storage.
| * | | cmTarget: Split storage of compile definitions from genexes.Stephen Kelly2015-08-071-32/+19
| | | |
| * | | cmTarget: Split storage of compile features from genexes.Stephen Kelly2015-08-071-12/+17
| | | |
| * | | cmTarget: Split storage of compile options from genexes.Stephen Kelly2015-08-071-25/+31
| | | |
| * | | cmTarget: Split storage of include directories from genexes.Stephen Kelly2015-08-077-26/+60
| | | |
| * | | cmTarget: Request only the link libraries where needed.Stephen Kelly2015-08-071-1/+2
| | | |
| * | | cmLinkImplementationLibraries: Move to namespace scope.Stephen Kelly2015-08-065-22/+23
| | | |
| * | | cmLinkItem: Split to separate file.Stephen Kelly2015-08-063-26/+49
| | | |
| * | | cmComputeLinkInformation: Simplify generator object access.Stephen Kelly2015-08-061-11/+7
| |/ /
* | | 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, ...).