summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Remove method calls just repeating the default.Stephen Kelly2015-05-183-5/+0
|
* cmGlobalUnixMakefileGenerator3: Host the DefineWindowsNULL.Stephen Kelly2015-05-168-14/+9
|
* cmGlobalUnixMakefileGenerator3: Host the include directive.Stephen Kelly2015-05-168-15/+10
| | | | There is no sense in copying this to each cmLocalGenerator.
* cmLocalGenerator: Remove unused method.Stephen Kelly2015-05-161-1/+0
|
* cmGlobalGenerator: Add NVI wrapper to create local generator.Stephen Kelly2015-05-1614-18/+26
|
* Merge topic 'refactor-cmLocalGenerator'Brad King2015-05-1552-360/+401
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ce167b54 cmMakefile: Handle CMP0014 before configuring the generator. 7baef756 cmLocalGenerator: Assert that there is a parent. 63255342 cmMakefile: Remove redundant variable set. 894961af cmMakefile: Use the state to determine the parent directory. 115e9199 Use new top-level check abstraction. c5059c90 cmLocalGenerator: Add abstraction to check if top-level. b17686d2 cmGlobalGenerator: Move some flags from cmLocalGenerator. ed41a8e7 cmLocalGenerator: Port loops to cmState::Snapshot. 48a9e91b cmState: Add an accessor for Parent snapshot and a validity check. e7f7c2e2 cmLocalGenerator: Convert two recursive methods to loops. c5cb3a73 cmLocalGenerator: Get project directories from the cmState. 76b59831 cmLocalGenerator: Initialize state before creating cmMakefile. 34c9ee2e cmLocalGenerator: Require a global generator in the constructor. 3837c483 Tests: Add case for 'ctest' run with bad CTestTestfile b317b38d cmGlobalBorlandMakefileGenerator: Do not inherit from NMake generator 94867698 Don't use a cmLocalGenerator instance to call static methods. ...
| * cmMakefile: Handle CMP0014 before configuring the generator.Stephen Kelly2015-05-143-38/+45
| |
| * cmLocalGenerator: Assert that there is a parent.Stephen Kelly2015-05-141-4/+1
| | | | | | | | | | | | If the CMakeLists.txt file does not exist, there must be a parent. The case for the top-level of the project is already handled in cmake::DoPreConfigureChecks.
| * cmMakefile: Remove redundant variable set.Stephen Kelly2015-05-141-1/+0
| | | | | | | | The variable is initialized by the constructor already.
| * cmMakefile: Use the state to determine the parent directory.Stephen Kelly2015-05-141-3/+4
| | | | | | | | Do not depend on the local generator for that.
| * Use new top-level check abstraction.Stephen Kelly2015-05-142-3/+3
| |
| * cmLocalGenerator: Add abstraction to check if top-level.Stephen Kelly2015-05-144-10/+10
| | | | | | | | Move from the cmLocalNinjaGenerator. Fix the case of the name.
| * cmGlobalGenerator: Move some flags from cmLocalGenerator.Stephen Kelly2015-05-1416-81/+79
| | | | | | | | | | These flags are global, and so they belong here instead of being set on each local generator.
| * cmLocalGenerator: Port loops to cmState::Snapshot.Stephen Kelly2015-05-141-22/+20
| | | | | | | | | | Make this code less dependent on being part of cmLocalGenerator, where it doesn't really belong.
| * cmState: Add an accessor for Parent snapshot and a validity check.Stephen Kelly2015-05-142-0/+24
| |
| * cmLocalGenerator: Convert two recursive methods to loops.Stephen Kelly2015-05-141-20/+50
| |
| * cmLocalGenerator: Get project directories from the cmState.Stephen Kelly2015-05-141-37/+36
| | | | | | | | Make this class and cmMakefile less interdependent.
| * cmLocalGenerator: Initialize state before creating cmMakefile.Stephen Kelly2015-05-143-15/+23
| | | | | | | | Access the state from the local generator in the cmMakefile.
| * cmLocalGenerator: Require a global generator in the constructor.Stephen Kelly2015-05-1438-94/+66
| | | | | | | | Port generator factory methods to pass it.
| * Tests: Add case for 'ctest' run with bad CTestTestfileBrad King2015-05-142-0/+17
| |
| * cmGlobalBorlandMakefileGenerator: Do not inherit from NMake generatorBrad King2015-05-141-1/+1
| | | | | | | | | | | | | | The Borland generator re-implements every method the NMake generator does, so there is no reason to inherit this way. Instead inherit directly from cmGlobalUnixMakefileGenerator3 like all the other makefile generators do.
| * Don't use a cmLocalGenerator instance to call static methods.Stephen Kelly2015-05-145-23/+21
| |
| * cmLocalGenerator: Remove EscapeForShellOldStyle to only caller.Stephen Kelly2015-05-143-33/+30
| |
| * cmLocalGenerator: Remove unused members.Stephen Kelly2015-05-141-4/+0
| |
* | Merge topic 'disallow-install-of-export'Brad King2015-05-1514-3/+131
|\ \ | | | | | | | | | | | | | | | b85d3b66 install: Disallow installing export() result. 501c237a install: Use an intermediate filesVector variable.
| * | install: Disallow installing export() result.Stephen Kelly2015-05-1414-0/+126
| | |
| * | install: Use an intermediate filesVector variable.Stephen Kelly2015-05-141-3/+5
| |/ | | | | | | Reduce noise.
* | Merge topic 'fix-tests-in-usr-local'Brad King2015-05-155-1/+23
|\ \ | | | | | | | | | | | | | | | d430cb7c Tests: Fix failures when running under the default install prefix (#15566) 332ee3e3 Tests: Fix CheckSourceTree test when build is under source (#15566)
| * | Tests: Fix failures when running under the default install prefix (#15566)Brad King2015-05-144-0/+12
| | | | | | | | | | | | | | | | | | | | | Fix test cases whose behavior differs when their source or build tree is under CMAKE_INSTALL_PREFIX by setting an install prefix under the build tree. Otherwise they may fail when run under the default install prefix (e.g. /usr/local).
| * | Tests: Fix CheckSourceTree test when build is under source (#15566)Brad King2015-05-141-1/+11
| | | | | | | | | | | | | | | | | | Since the build tree will populate content under the source tree the test cannot reliably check that the source tree is pristine. Simply skip most of the test in this case.
* | | Merge topic 'FindSquish-sh-exit'Brad King2015-05-151-2/+2
|\ \ \ | | | | | | | | | | | | | | | | 12b85b17 FindSquish: Avoid bash-specific behavior in test script (#15568)
| * | | FindSquish: Avoid bash-specific behavior in test script (#15568)Felix Geyer2015-05-141-2/+2
| |/ / | | | | | | | | | | | | | | | | | | Fix Squish4RunTestCase.sh to be POSIX compliant by exiting with 255 explicitly instead of depending on bash to translate -1 to 255. This script is used by the SQUISH_V3_ADD_TEST and SQUISH_V4_ADD_TEST macros provided by FindSquish.
* | | CMake Nightly Date StampKitware Robot2015-05-151-1/+1
| |/ |/|
* | Merge topic 'update-kwsys'Brad King2015-05-142-5/+9
|\ \ | | | | | | | | | | | | | | | | | | 576ef8c5 KWSys: Tell Git not to export .gitattributes c9709dff Merge branch 'upstream-kwsys' into update-kwsys 3b815ed2 KWSys 2015-05-12 (b1d560a0)
| * | KWSys: Tell Git not to export .gitattributesBrad King2015-05-131-4/+0
| | | | | | | | | | | | | | | | | | | | | KWSys upstream added an attribute to export .gitattributes so that importing snapshots into the sources of other projects would bring along the attributes. However, we don't want to export them from CMake. Drop .gitattributes entries not relevant to CMake.
| * | Merge branch 'upstream-kwsys' into update-kwsysBrad King2015-05-131-1/+9
| |\ \
| | * | KWSys 2015-05-12 (b1d560a0)KWSys Robot2015-05-131-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract upstream KWSys using the following shell commands. $ git archive --prefix=upstream-kwsys/ b1d560a0 | tar x $ git shortlog --no-merges --abbrev=8 --format='%h %s' 34fceb50..b1d560a0 Brad King (1): b1d560a0 CPU: MIPS is biendian
* | | | Merge topic 'FindHDF5-version-support'Brad King2015-05-142-7/+22
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 56858178 FindHDF5: Add version support 4bd122ad FindHDF5: Check for a few H5pubconf*.h name variants
| * | | | FindHDF5: Add version supportAxel Huebl2015-05-132-5/+18
| | | | | | | | | | | | | | | | | | | | | | | | | Detect the HDF5 version and set HDF5_VERSION just as we detect HDF5_IS_PARALLEL from the header already.
| * | | | FindHDF5: Check for a few H5pubconf*.h name variantsBrad King2015-05-131-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | Some distros package H5pubconf.h as "H5pubconf-32.h" or "H5pubconf-64.h" depending on the architecture. Look for all of these names.
* | | | | Merge topic 'FindJava-openjdk-8'Brad King2015-05-141-1/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | 7953867b FindJava: Fix OpenJDK 8 version detection (#15565)
| * | | | FindJava: Fix OpenJDK 8 version detection (#15565)Felix Geyer2015-05-121-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | The openjdk-8 (8u45-b14-2) package on Debian unstable has extra text after the version number components. Match this and add it to the reported version string.
* | | | CMake Nightly Date StampKitware Robot2015-05-141-1/+1
| |/ / |/| |
* | | CMake Nightly Date StampKitware Robot2015-05-131-1/+1
|/ /
* | Merge topic 'ctest-no-make-i'Brad King2015-05-1225-7/+156
|\ \ | | | | | | | | | | | | | | | | | | 226df303 CTest: Stop telling 'make' to ignore errors with -i 28e7a135 Help: Fix build_command alternative signature docs 231601b6 build_command: Choose configuration consistently across signatures
| * | CTest: Stop telling 'make' to ignore errors with -iBrad King2015-05-1225-5/+154
| | | | | | | | | | | | Add policy CMP0061 to maintain compatibility for existing projects.
| * | Help: Fix build_command alternative signature docsBrad King2015-05-121-1/+1
| | | | | | | | | | | | | | | Do not specify that --config will not be added, because the command does add it.
| * | build_command: Choose configuration consistently across signaturesBrad King2015-05-121-1/+1
| | | | | | | | | | | | | | | | | | Teach the legacy two-argument signature to use CMAKE_CONFIG_TYPE from the environment only if it is non-empty. This makes behavior consistent with the main signature.
* | | Merge topic 'cpack-deb-component-dependencies'Brad King2015-05-128-16/+294
|\ \ \ | | | | | | | | | | | | | | | | | | | | 1237d5fa Help: Add notes for topic 'cpack-deb-component-dependencies' e3f522f6 CPack/DEB per component dependencies
| * | | Help: Add notes for topic 'cpack-deb-component-dependencies'Brad King2015-05-121-0/+6
| | | |