summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Help: Fix {GIT,P4}UpdateCustom documentation (#15512)Brad King2015-04-131-2/+2
| | | | | | | | The GITUpdateCustom and P4UpdateCustom options take only one command line with all arguments as a ;-list, not a ;-list of multiple command lines. Fix the incorrect documentation originally added by commit v3.1.0-rc1~463^2 (Help: Document ctest dashboard client usage, 2014-05-30).
* Merge topic 'introduce-cmState'Brad King2015-04-1357-396/+595
|\ | | | | | | | | | | | | | | f081c5bd cmState: Move CacheEntryType enum from cmCacheManager. f71fdf0e cmMakefile: Remove unused CacheManager accessor. ff7169a0 Port to cmState. a6b1ad13 Introduce cmState class.
| * cmState: Move CacheEntryType enum from cmCacheManager.Stephen Kelly2015-04-1350-266/+239
| |
| * cmMakefile: Remove unused CacheManager accessor.Stephen Kelly2015-04-133-9/+0
| | | | | | | | Remove unneeded friend declarations from cmCacheManager.
| * Port to cmState.Stephen Kelly2015-04-1319-151/+156
| |
| * Introduce cmState class.Stephen Kelly2015-04-139-0/+230
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At this point, it is an interface to the cache. It will be extended to be a universal interface for access to and manipulation of configuration-time data (defintions, properties on targets, directories, source files etc). This will allow porting all command implementations away from the cmMakefile and cmTarget classes, and result in something more-purely related to configuration-time processing of cmake commands. That should serve at least the following goals: * Split the CMake implementation more definitively into three stages: Configuration, computation and generation, and be able to implement each optimally for memory access patterns etc. * Make better IDE integration possible by making more configuration data available. * Make it possiblte to use a smaller library than CMakeLib.a in cpack and ctest, resulting in smaller executables. * Make it possible to run the configure step multiple times in the same CMake run (#14539). Manage its lifetime in the cmake class, and add a convenience accessor to cmMakefile.
* | Merge topic 'cmake-cleanups'Brad King2015-04-1320-157/+185
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 07d44d63 cmake: Remove confusing duplication. ea819b29 cmMakefile: Remove unused method. 6ad86c7f cmMakefile: Remove bad comment. fca2b542 cmMakefile: Internalize setting of CMakeInstance on Properties. 7bb4e3db cmMakefile: Out-of-line Home directory accessors. 6241253a cmake: Out-of-line Home and Start directory methods. 0ee3ccb3 cmake: Fix variable name bugs. 57dd094e Use vector, not list for cmCommand storage. 6deb43e6 Remove some files which do not need to be in BootstrapCommands. ecdb1b3b Add some missing includes. 04b307b9 cmake: Simplify CommandExists method. 0f1f324b cmake: Rename oddly named variables. 275185ac cmake: Constify GetCommand method. c57f086a cmake: Don't lower-case a string needlessly. 23368c9b cmake: Use make_pair instead of Foo::value_type. 14c70b8c cmake: out-of-line try compile state methods. ...
| * | cmake: Remove confusing duplication.Stephen Kelly2015-04-121-4/+0
| | |
| * | cmMakefile: Remove unused method.Stephen Kelly2015-04-122-28/+0
| | |
| * | cmMakefile: Remove bad comment.Stephen Kelly2015-04-121-1/+0
| | |
| * | cmMakefile: Internalize setting of CMakeInstance on Properties.Stephen Kelly2015-04-122-1/+1
| | |
| * | cmMakefile: Out-of-line Home directory accessors.Stephen Kelly2015-04-122-8/+12
| | |
| * | cmake: Out-of-line Home and Start directory methods.Stephen Kelly2015-04-122-26/+38
| | |
| * | cmake: Fix variable name bugs.Stephen Kelly2015-04-122-5/+5
| | |
| * | Use vector, not list for cmCommand storage.Stephen Kelly2015-04-126-10/+10
| | |
| * | Remove some files which do not need to be in BootstrapCommands.Stephen Kelly2015-04-124-3/+7
| | |
| * | Add some missing includes.Stephen Kelly2015-04-121-0/+2
| | |
| * | cmake: Simplify CommandExists method.Stephen Kelly2015-04-121-2/+1
| | |
| * | cmake: Rename oddly named variables.Stephen Kelly2015-04-121-6/+6
| | |
| * | cmake: Constify GetCommand method.Stephen Kelly2015-04-122-3/+3
| | |
| * | cmake: Don't lower-case a string needlessly.Stephen Kelly2015-04-121-1/+1
| | |
| * | cmake: Use make_pair instead of Foo::value_type.Stephen Kelly2015-04-121-2/+2
| | | | | | | | | | | | It works with all supported compilers.
| * | cmake: out-of-line try compile state methods.Stephen Kelly2015-04-122-4/+12
| | |
| * | cmake: Remove duplicate condition.Stephen Kelly2015-04-121-4/+0
| | |
| * | cmake: Remove DebugConfigs member.Stephen Kelly2015-04-124-35/+19
| | | | | | | | | | | | It adds needless complexity to global property handling.
| * | Test expected value of DEBUG_CONFIGURATIONS global property.Stephen Kelly2015-04-123-0/+53
| | |
| * | cmake: Remove method with no external users.Stephen Kelly2015-04-122-8/+5
| | | | | | | | | | | | Port internal users to access the member.
| * | cmake: Don't set the CMakeInstance on the Properties member.Stephen Kelly2015-04-121-1/+0
| | | | | | | | | | | | | | | There is no need, as global properties have nowhere to chain up to.
| * | cmGlobalGenerator: Store languages as vector, not map.Stephen Kelly2015-04-122-8/+11
| | | | | | | | | | | | The second component of the map is never used.
* | | Merge branch 'release'Brad King2015-04-130-0/+0
|\ \ \
| * \ \ Merge branch 'custom-command-multiple-outputs' into releaseBrad King2015-04-105-31/+130
| |\ \ \
| * \ \ \ Merge branch 'fix-libarchive-mktemp' into releaseBrad King2015-04-091-3/+5
| |\ \ \ \
| * \ \ \ \ Merge branch 'fix-liblzma-optimize' into releaseBrad King2015-04-091-0/+10
| |\ \ \ \ \
| | * | | | | liblzma: Disable GNU 3.3 compiler optimizationsBrad King2015-04-091-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The GNU 3.3 optimizer causes bad behavior in liblzma, so disable it.
| | * | | | | liblzma: Disable XL compiler optimizationsBrad King2015-04-091-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Somehow the XL compiler optimizations create incorrect behavior in liblzma and lead to crashes or truncated output during compression.
| * | | | | | Merge branch 'fix-liblzma-access-alignment' into releaseBrad King2015-04-011-1/+7
| |\ \ \ \ \ \ | | |/ / / / /
| * | | | | | Merge branch 'curl-cygwin-no-windows' into releaseBrad King2015-03-261-2/+8
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'FindMFC-CMP0054' into releaseBrad King2015-03-261-1/+1
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'file-LOCK-close' into releaseBrad King2015-03-262-0/+7
| |\ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ Merge topic 'custom-command-multiple-outputs'Brad King2015-04-134-26/+118
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9660a3cc Makefile: Fix multiple custom command outputs with one missing 5c08e255 KWSys SystemTools: Teach Touch with !create to succeed on missing file
| * | | | | | | | | Makefile: Fix multiple custom command outputs with one missingBrad King2015-04-104-26/+118
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The use of "cmake -E touch_nocreate" added in commit v3.2.1~4^2 (Makefile: Fix multiple custom command outputs regression, 2015-03-06) caused builds to fail when one of the outputs is intentionally not created. This was fixed by our parent commit by making touch_nocreate succeed when the file is missing. Add a test case covering it. For the Watcom WMake generator, check for the SYMBOLIC source file property separately on each output. The mark is needed on outputs that are not really created to tell 'wmake' not to complain that it is missing. The mark is also needed on outputs that are created or 'wmake' will not consider them out of date when they exist. Inspired-by: Ben Boeckel <ben.boeckel@kitware.com>
| * | | | | | | | | KWSys SystemTools: Teach Touch with !create to succeed on missing fileBrad King2015-04-101-5/+12
| |/ / / / / / / /
* | | | | | | | | Merge topic 'cmake-G-print-generators'Brad King2015-04-137-4/+43
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 588dcb33 cmake: Provide guidance when an invalid -G option is given
| * | | | | | | | | cmake: Provide guidance when an invalid -G option is givenGerald Combs2015-04-107-4/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Print a list of generators if no generator or an invalid one is supplied. Signed-off-by: Gerald Combs <gerald@wireshark.org>
* | | | | | | | | | Merge topic 'move-command-line-tests'Brad King2015-04-1340-94/+108
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4e039a9a Tests: Move more command line tests into RunCMake.CommandLine
| * | | | | | | | | Tests: Move more command line tests into RunCMake.CommandLineBrad King2015-04-1040-94/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Port most CMakeTestBadCommandLines test cases to RunCMake.CommandLine and drop the former test. Add validation of expected results, which was not done by the old test.
* | | | | | | | | | Merge topic 'c-locale-messages'Brad King2015-04-134-41/+103
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a198839a CTest: Fix locale used for VCS updates
| * | | | | | | | | | CTest: Fix locale used for VCS updatesNils Gladitz2015-04-134-41/+103
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6a661f06030b85b4484733375bbb0aa23eca7446 fixed the locale used for message output but at the same time broke the locale used for filename encodings. This commit preserves LC_CTYPE in the presence of LC_ALL.
* | | | | | | | | | | Merge topic 'emulator-property'Brad King2015-04-131-0/+8
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c9e9c31c Tests: Create pseudo_emulator output dir for Xcode 2.x
| * | | | | | | | | | | Tests: Create pseudo_emulator output dir for Xcode 2.xBrad King2015-04-101-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apply the workardound from commit v2.8.2~598 (Create CMakeLibTests output dir for Xcode, 2009-12-09) to the pseudo_emulator tool.