summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* cmMakefile: Remove fullPath parameter from ReadListFile.Stephen Kelly2015-04-184-15/+3
| | | | | | There is no reason for this to be a responsibility of ReadListFile. Additionally, the only user of it already computes it itself.
* CPack: Read the config listfile in the normal way.Stephen Kelly2015-04-181-1/+1
| | | | | | | | | | | | | This is a unique function call in CMake, and it was likely a programming error when introduced. All other similar calls to ReadListFile use a null first paramter. The effect of this patch is to no-longer define CMAKE_PARENT_LIST_FILE to the config file itself while evaluating it. The ReadListFile method also no longer hits a condition that it uses CollapseFullPath on the input file. However, as cpack does not set the StartDirectory anyway, this has no effect. See bug 15522.
* Merge topic 'cpack-one-component-only'Brad King2015-04-171-2/+2
|\ | | | | | | | | ed0b0630 CPack: Fix single component packaging
| * CPack: Fix single component packagingRaffi Enficiaud2015-04-161-2/+2
| | | | | | | | | | | | Refine logic added in commit 0ffd3534 (CPack single component packaging, 2015-04-02). Component packaging should be enabled if either at least one component or one group is set and should not require both.
* | Merge topic 'ninja-autogen'Brad King2015-04-171-0/+7
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | e8fdd5f1 QtAutogen: Workaround rcc CRCRLF newlines on Windows (#15459) 15f1a6b4 Tests/QtAutogen: Avoid touching files in the source tree 3f7c7c65 Tests/QtAutogen: Help Qt5Autogen test find Qt5 on Windows 26b5cc5e Tests/QtAutogen: Enable per-config source tests when possible 45566408 Tests/QtAutogen: Require CMake 3.1 to set policies everywhere
| * | QtAutogen: Workaround rcc CRCRLF newlines on Windows (#15459)Brad King2015-04-161-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | The 'rcc --list' operation may print newlines of the form CRCRLF, so strip any trailing CR characters found on each line. Update the Tests/QtAutogen test to use a resource named in a subdirectory. This causes 'rcc --list' to display a blank line and tests that it is correctly filtered out.
* | | CMake Nightly Date StampKitware Robot2015-04-171-1/+1
| | |
* | | Merge topic 'vs10-no-macros'Brad King2015-04-166-55/+5
|\ \ \ | | | | | | | | | | | | | | | | 885ab9ab VS: Drop reload macros for VS >= 10 (#11258,#14680)
| * | | VS: Drop reload macros for VS >= 10 (#11258,#14680)Brad King2015-04-156-55/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We never implemented them for VS 11 (2012), 12 (2013), or 14 (2015). For VS 10 (2010) the reload macro does not work correctly when run from inside a build launched through the IDE because stopping the build kills the CMake that is driving the reload. Fortunately VS >= 10 know how to reload the whole solution anyway.
* | | | Merge topic 'vs70-deprecate'Brad King2015-04-161-1/+18
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 7b8e7c4a Deprecate Visual Studio 7 generator (.NET 2002)
| * | | | Deprecate Visual Studio 7 generator (.NET 2002)Brad King2015-04-151-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | | Update documentation to mark the generator deprecated. Add a warning at the end of generation plus an option to turn off the warning.
* | | | | Merge topic 'vs6-deprecate'Brad King2015-04-161-1/+17
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | 85c2626b Deprecate Visual Studio 6 generator
| * | | | Deprecate Visual Studio 6 generatorBrad King2015-04-151-1/+17
| |/ / / | | | | | | | | | | | | | | | | Update documentation to mark the generator deprecated. Add a warning at the end of generation plus an option to turn off the warning.
* | | | CMake Nightly Date StampKitware Robot2015-04-161-1/+1
| | | |
* | | | Merge topic 'port-global-properties-to-cmState'Brad King2015-04-1532-415/+439
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5d056c0d Port Global property interaction to cmState. de722d7d Move property initialization to cmState. 9b5f80a8 Move global properties to cmState. 0076b5d8 cmake: Remove the happy global property scope pattern. 24b7f31d cmake: Remove unused cmCommand methods. 0aec4913 Port cmCommand consumers to cmState. 96f8c5f9 cmState: Move cmCommand-related methods from cmake class. 97e53ebb cmake: Simplify command clean up loop. 1e738bcf cmake: Simplify RemoveUnscriptableCommands algorithm. 62854e99 cmState: Move try_compile state from cmake class. db8425be cmake: Get enabled languages from cmState. 74de9a73 cmGlobalGenerator: Delegate storage of enabled languages to cmState. b159bff7 Move property definition to cmState.
| * | | | Port Global property interaction to cmState.Stephen Kelly2015-04-1516-62/+86
| | | | |
| * | | | Move property initialization to cmState.Stephen Kelly2015-04-152-8/+2
| | | | |
| * | | | Move global properties to cmState.Stephen Kelly2015-04-154-41/+70
| | | | |
| * | | | cmake: Remove the happy global property scope pattern.Stephen Kelly2015-04-157-18/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Global properties are already global in scope, so remove the overload for specifying it and port users of the API. The call from cmMakefile::GetProperty can be simplified because the scope is only used during chaining, and there is no further chaining after processing global properties.
| * | | | cmake: Remove unused cmCommand methods.Stephen Kelly2015-04-152-42/+0
| | | | |
| * | | | Port cmCommand consumers to cmState.Stephen Kelly2015-04-1511-37/+18
| | | | |
| * | | | cmState: Move cmCommand-related methods from cmake class.Stephen Kelly2015-04-134-82/+128
| | | | |
| * | | | cmake: Simplify command clean up loop.Stephen Kelly2015-04-131-13/+6
| | | | |
| * | | | cmake: Simplify RemoveUnscriptableCommands algorithm.Stephen Kelly2015-04-132-23/+8
| | | | | | | | | | | | | | | | | | | | Remove obsolete RemoveCommand method.
| * | | | cmState: Move try_compile state from cmake class.Stephen Kelly2015-04-133-8/+22
| | | | |
| * | | | cmake: Get enabled languages from cmState.Stephen Kelly2015-04-131-8/+3
| | | | | | | | | | | | | | | | | | | | | | | | | The check for a global generator is redundant - the enabled languages are only populated by the global generator.
| * | | | cmGlobalGenerator: Delegate storage of enabled languages to cmState.Stephen Kelly2015-04-133-12/+36
| | | | |
| * | | | Move property definition to cmState.Stephen Kelly2015-04-1312-97/+87
| | | | |
* | | | | Merge topic 'doc-ninja-non-experimental'Brad King2015-04-151-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 9ac05683 Ninja: Drop 'experimental' label in documentation
| * | | | | Ninja: Drop 'experimental' label in documentationBrad King2015-04-141-1/+1
| | |/ / / | |/| | | | | | | | | | | | | | | | | | This generator is no longer experimental and has been fairly mature for several releases already.
* | | | | CMake Nightly Date StampKitware Robot2015-04-151-1/+1
|/ / / /
* | | | CMake Nightly Date StampKitware Robot2015-04-141-1/+1
|/ / /
* | | Merge topic 'introduce-cmState'Brad King2015-04-1356-396/+594
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-138-0/+229
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1316-156/+129
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-123-2/+4
| | | | |
| * | | | 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
| | | | |