summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'refactor-cmLocalGenerator'Brad King2015-05-1550-360/+384
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * 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-152-3/+49
|\ \ | | | | | | | | | | | | | | | b85d3b66 install: Disallow installing export() result. 501c237a install: Use an intermediate filesVector variable.
| * | install: Disallow installing export() result.Stephen Kelly2015-05-142-0/+44
| | |
| * | install: Use an intermediate filesVector variable.Stephen Kelly2015-05-141-3/+5
| |/ | | | | | | Reduce noise.
* | 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
| |
* | 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-126-4/+34
|\ | | | | | | | | | | | | 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-126-3/+33
| | | | | | | | Add policy CMP0061 to maintain compatibility for existing projects.
| * 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 'find_package-no-cmake-gui-paths'Brad King2015-05-122-31/+1
|\ \ | | | | | | | | | | | | | | | 1506f9ca find_package: Drop search in recent cmake-gui locations 8d484463 FindFLTK: Drop search in recent cmake-gui locations
| * | find_package: Drop search in recent cmake-gui locationsBrad King2015-05-082-31/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The find_package command, on Windows, has always searched build trees recently visited by cmake-gui (or CMakeSetup at one time). This was done when the command was created with the intention of simplifying workflows involving building multiple dependent projects. However, this behavior depends on recent developer interaction and therefore can create different find results based on transient system states. It can lead to surprising results and user confusion. Since this behavior was first added CMake has gained many more search options, better error messages when a package is not found, and a package registry. The latter in particular allows projects to make their build trees available for dependent projects to find without user intervention. Therefore the originally intended workflow can be achieved in other, more stable ways. After the above evoluion of find_package we have now decided that the magic search-where-cmake-gui-was behavior does more harm than good. Drop it. We do not need a policy for this behavior change because it only affects interactive use.
* | | Merge topic 'detect-c++14-missing-gets'Brad King2015-05-122-0/+35
|\ \ \ | | | | | | | | | | | | | | | | 3307e10f Avoid using C++14 to build CMake if cstdio breaks
| * | | Avoid using C++14 to build CMake if cstdio breaksBrad King2015-05-082-0/+35
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | The GNU 4.8 standard library's cstdio header is not aware that C++14 honors C11's removal of "gets" from stdio.h and results in an error: /.../include/c++/4.8/cstdio:120:11: error: no member named 'gets' in the global namespace Detect this problematic case and default to using C++11 instead of C++14 for building CMake itself.
* | | Merge topic 'ninja-gcc-windows'Brad King2015-05-121-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | cf8ce7a3 RC: Do not override MinGW Makefiles generator preference ca658a45 Ninja: Use forward slashes for linking with any GCC on Windows (#15439)
| * | | Ninja: Use forward slashes for linking with any GCC on Windows (#15439)Thomas Herz2015-05-081-1/+1
| | | | | | | | | | | | | | | | | | | | Fix a condition forgotten by commit b3de0dfe (Ninja: Use forward slashes for any GCC on Windows, 2015-05-07).
* | | | CMake Nightly Date StampKitware Robot2015-05-121-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2015-05-111-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2015-05-101-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2015-05-091-1/+1
| |/ / |/| |
* | | Merge topic 'ninja-gcc-windows'Brad King2015-05-087-57/+53
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | 20560e8d Ninja: Do not use newlines in response files with Windows GNU tools (#15439) b3de0dfe Ninja: Use forward slashes for any GCC on Windows (#15439) 378c2a0e Ninja: Refactor detection of MinGW tools on Windows 957c2aac RC: Simplify selection of resource compiler based on C/C++ toolchain
| * | Ninja: Do not use newlines in response files with Windows GNU tools (#15439)Thomas Herz2015-05-071-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | Since commit v2.8.11~213^2 (Ninja: Avoid LNK1170 linker error, 2013-02-01) we generate linker response files with "$in_newline" to support a large number of object files with the MS link.exe tool. However, the GNU linker on Windows does not understand the newline endings that Ninja puts in the response files. Switch back to "$in" for that case.
| * | Ninja: Use forward slashes for any GCC on Windows (#15439)Thomas Herz2015-05-073-7/+11
| | | | | | | | | | | | | | | Any GCC compiler on a Windows host needs forward slashes, not just those built for MinGW.
| * | Ninja: Refactor detection of MinGW tools on WindowsBrad King2015-05-073-21/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check for CMAKE_COMPILER_IS_MINGW only after enabling a language when it might actually be set. Previously this worked by accident because the check for working compiler or a second language enabled would cause the code path to be taken. Store UsingMinGW as an instance member of cmGlobalNinjaGenerator so that it is reset on each reconfigure. Otherwise cmake-gui cannot switch between build trees for MinGW or non-MinGW tools.
| * | RC: Simplify selection of resource compiler based on C/C++ toolchainBrad King2015-05-074-35/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert the refactoring by commit v2.8.11~105^2~1 (Ninja: use MinGW generator code in EnableLanguage, 2013-03-09) and move the MinGW- specific logic back to the "MinGW Makefiles" generator. Instead teach the platform information modules for GNU and MSVC on Windows to set the preferred RC compiler just before enabling the RC language. This way we choose the RC compiler based on the C/C++ toolchain that is actually enabled.
* | | Merge topic 'execute_process-merge-output'Brad King2015-05-081-5/+19
|\ \ \ | | | | | | | | | | | | | | | | f65bb82f execute_process: Improve stdout/stderr merging
| * | | execute_process: Improve stdout/stderr mergingBrad King2015-05-071-5/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the KWSys Process "MergeOutput" option to give the child process the same pipe (or file) for both stdout and stderr. This allows natural merging of stdout and stderr together instead of merging on arbitrary buffered read boundaries as before.
* | | | Merge topic 'update-kwsys'Brad King2015-05-083-4/+23
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | 31c218e6 Merge branch 'upstream-kwsys' into update-kwsys ac94a796 KWSys 2015-05-05 (34fceb50)
| * | | Merge branch 'upstream-kwsys' into update-kwsysBrad King2015-05-073-4/+23
| | |/ | |/|
* | | CMake Nightly Date StampKitware Robot2015-05-081-1/+1
|/ /