summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'libarchive-modern-apis'Brad King2015-08-252-16/+16
|\ | | | | | | | | e7f93715 Use modern libarchive APIs
| * Use modern libarchive APIsPáder Rezső2015-08-242-16/+16
| | | | | | | | | | Replace use of deprecated libarchive3 functions with their modern equivalents.
* | Merge topic 'fphsa-typo'Brad King2015-08-251-1/+1
|\ \ | | | | | | | | | | | | 64e527db FPHSA: fix typo in documentation
| * | FPHSA: fix typo in documentationRolf Eike Beer2015-08-241-1/+1
| |/
* | Merge topic 'fix-load-command-doc-classification'Brad King2015-08-251-1/+1
|\ \ | | | | | | | | | | | | 1869eacb Help: Fix classification of load_command in command TOC.
| * | Help: Fix classification of load_command in command TOC.James Johnston2015-08-251-1/+1
| | | | | | | | | | | | | | | | | | In CMake 3.0, the load_command command was deprecated. However, the position of load_command in the help TOC was not fixed at that time: it was still listed as a "Normal Command".
* | | Merge topic 'FindJNI-linux-x32'Brad King2015-08-251-0/+4
|\ \ \ | | | | | | | | | | | | | | | | c4d78b8b FindJNI: Add support for x32 architecture on Linux (#15710)
| * | | FindJNI: Add support for x32 architecture on Linux (#15710)Thorsten Glaser2015-08-241-0/+4
| | |/ | |/| | | | | | | | | | This architecture uses an amd64 kernel but x32 userland. Use CMAKE_LIBRARY_ARCHITECTURE to distinguish it for now.
* | | Merge topic 'cmState-prop_dir'Brad King2015-08-254-138/+180
|\ \ \ | | | | | | | | | | | | | | | | | | | | f4150bd8 cmState: Move directory Properties from cmMakefile. 01787547 cmMakefile: Inline GetDefinitions into GetProperty.
| * | | cmState: Move directory Properties from cmMakefile.Stephen Kelly2015-08-244-142/+180
| | | |
| * | | cmMakefile: Inline GetDefinitions into GetProperty.Stephen Kelly2015-08-241-1/+5
| |/ / | | | | | | | | | It will soon move to cmState.
* | | CMake Nightly Date StampKitware Robot2015-08-251-1/+1
| |/ |/|
* | Merge topic 'drop-cmsys-std-layer'Brad King2015-08-2418-76/+56
|\ \ | |/ |/| | | | | | | | | 04e708d8 Remove use of include <cmsys/IOStream.hxx> from KWSys e8585f45 Remove use of include <cmsys/stl/*> and cmsys_stl::* 6db713c0 Remove use of include <cmsys/ios/*> and cmsys_ios::*
| * Remove use of include <cmsys/IOStream.hxx> from KWSysBrad King2015-08-211-8/+0
| | | | | | | | We no longer need this compatibility layer for the compilers we support.
| * Remove use of include <cmsys/stl/*> and cmsys_stl::*Brad King2015-08-205-7/+2
| | | | | | | | We no longer need this compatibility layer for the compilers we support.
| * Remove use of include <cmsys/ios/*> and cmsys_ios::*Brad King2015-08-2014-61/+54
| | | | | | | | We no longer need this compatibility layer for the compilers we support.
* | Merge topic 'cmState-definitions'Brad King2015-08-245-125/+185
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | bff27391 cmState: Host variable definitions. 6954c893 cmState: Add a VariableScope snapshot type. 1fc645bd cmState: Add a Base snapshot type. 0f070dd3 cmMakefile: Decouple the container of cmDefinitions from scoping logic. 25e04ddf cmDefinitions: Implement in terms of cmLinkedTree. 4bbe261c cmMakefile: Extract InitializeVarScope method.
| * | cmState: Host variable definitions.Stephen Kelly2015-08-233-148/+126
| | |
| * | cmState: Add a VariableScope snapshot type.Stephen Kelly2015-08-233-1/+38
| | | | | | | | | | | | Match the scopes currently used in cmMakefile for definitions.
| * | cmState: Add a Base snapshot type.Stephen Kelly2015-08-232-2/+4
| | | | | | | | | | | | For completeness mostly.
| * | cmMakefile: Decouple the container of cmDefinitions from scoping logic.Stephen Kelly2015-08-231-24/+56
| | | | | | | | | | | | Maintain a Parent tree node for writing to in RaiseScope.
| * | cmDefinitions: Implement in terms of cmLinkedTree.Stephen Kelly2015-08-233-33/+39
| | | | | | | | | | | | | | | | | | | | | Store the definitions in a cmLinkedTree in the cmMakefile. This can be moved to cmState and then the tree will provide snapshotting possibilities. It will also make the Closure copy created at the start of each cmMakefile unnecesarry.
| * | cmMakefile: Extract InitializeVarScope method.Stephen Kelly2015-08-231-1/+6
| | |
* | | Merge topic 'ios-app-bundle-layout'Brad King2015-08-246-10/+116
|\ \ \ | | | | | | | | | | | | | | | | 744e6c49 Fix iOS Bundle layouts (#15669)
| * | | Fix iOS Bundle layouts (#15669)Gregor Jasny2015-08-246-10/+116
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In contrast to Mac OS X App bundle layout the iOS one lacks the Contents/MacOSX structure. See also the Bundle Structures documentation in Mac Developer Library: https://developer.apple.com/library/mac/documentation/CoreFoundation/Conceptual/CFBundles/BundleTypes/BundleTypes.html For now detect iOS targets by checking the SDK name/path.
* | | | Merge topic 'remove-unused-cmPolicies'Brad King2015-08-242-4/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | d8a57148 cmake: Remove unused cmPolicies member.
| * | | | cmake: Remove unused cmPolicies member.Stephen Kelly2015-08-232-4/+0
| | |/ / | |/| | | | | | | | | | | | | | | | | | heaptrack showed a 1 byte allocation with the backtrace pointing here, as is the case since commit v3.3.0-rc1~112^2~5 (cmPolicies: Remove unused cmPolicy class., 2015-05-03)
* | | | Merge topic 'refactor-progress'Brad King2015-08-247-50/+71
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3fa1b964 cmGlobalUnixMakefileGenerator3: Change the progress container key. 55e39276 cmState: Make it possible to order cmState::Snapshot. 04168cbb cmGlobalUnixMakefileGenerator3: Rename member. 2394584c cmGlobalGenerator: Rename progress initializer method. b9eb3cd1 cmGlobalGenerator: Move LG to target map to subclass. f5d2b7a6 cmGlobalGenerator: Remove clearance of map.
| * | | | cmGlobalUnixMakefileGenerator3: Change the progress container key.Stephen Kelly2015-08-232-4/+5
| | | | |
| * | | | cmState: Make it possible to order cmState::Snapshot.Stephen Kelly2015-08-233-0/+20
| | | | |
| * | | | cmGlobalUnixMakefileGenerator3: Rename member.Stephen Kelly2015-08-232-4/+4
| | | | |
| * | | | cmGlobalGenerator: Rename progress initializer method.Stephen Kelly2015-08-234-4/+4
| | | | |
| * | | | cmGlobalGenerator: Move LG to target map to subclass.Stephen Kelly2015-08-234-47/+48
| | | | | | | | | | | | | | | | | | | | This is the only user.
| * | | | cmGlobalGenerator: Remove clearance of map.Stephen Kelly2015-08-231-1/+0
| |/ / / | | | | | | | | | | | | It is always cleared before being re-populated.
* | | | Merge topic 'generators-use-cmLocalGenerator'Brad King2015-08-2411-28/+53
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1f39ee5b cmInstallExportGenerator: Require cmLocalGenerator, not cmMakefile. c259b830 cmTestGenerator: Require cmLocalGenerator, not cmMakefile. 75e511ee cmInstallFilesGenerator: Require cmLocalGenerator, not cmMakefile.
| * | | | cmInstallExportGenerator: Require cmLocalGenerator, not cmMakefile.Stephen Kelly2015-08-234-10/+17
| | | | |
| * | | | cmTestGenerator: Require cmLocalGenerator, not cmMakefile.Stephen Kelly2015-08-233-5/+19
| | | | |
| * | | | cmInstallFilesGenerator: Require cmLocalGenerator, not cmMakefile.Stephen Kelly2015-08-235-13/+17
| |/ / /
* | | | Merge topic 'fix-include_directories-BEFORE'Brad King2015-08-244-6/+11
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | a4bd3010 include_directories: Fix regression in BEFORE option (#15693)
| * | | | include_directories: Fix regression in BEFORE option (#15693)Brad King2015-08-214-6/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactoring in commit 6ed9c7e0 (cmState: Host buildsystem properties for directories, 2015-07-18) broke include_directories(BEFORE). Fix it and add a test case.
* | | | | CMake Nightly Date StampKitware Robot2015-08-241-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2015-08-231-1/+1
| |/ / / |/| | |
* | | | CMake Nightly Date StampKitware Robot2015-08-221-1/+1
|/ / /
* | | Merge topic 'improve-variable-help-formatting'Brad King2015-08-21194-508/+537
|\ \ \ | | | | | | | | | | | | | | | | 3bb707f0 Help: Improve formatting of variable documentation
| * | | Help: Improve formatting of variable documentationJames Johnston2015-08-21194-508/+537
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve formatting, primarily by: * Adding links to relevant commands, properties, generators, and so on. * Converting code, symbols, paths, and so on to fixed-width fonts. * Hard wrapping lines to 80 characters or less.
* | | | Merge topic 'modules-no-soname'Brad King2015-08-2111-36/+93
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | f799ffb5 Do not set SONAME for MODULE library targets (#15705) 899458ab Tests: Cover NO_SONAME property for SHARED libraries
| * | | | Do not set SONAME for MODULE library targets (#15705)Felix Geyer2015-08-206-36/+23
| | | | | | | | | | | | | | | | | | | | | | | | | The SONAME field is only useful for shared libraries that application link against.
| * | | | Tests: Cover NO_SONAME property for SHARED librariesBrad King2015-08-205-0/+70
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | This property was added by commit v2.8.9~204^2~2 (Support building shared libraries or modules without soname, 2012-04-22). A test for using the property on MODULE libraries was added by commit v2.8.9~204^2~1 (Test NO_SONAME property, 2012-04-23). Add such a test for SHARED libraries too.
* | | | Merge topic 'FindCUDA-vs2013-separate-compilation'Brad King2015-08-211-3/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 9b2f6992 FindCUDA: Fix object build rule for separate compilation on VS 2013+ (#15697)
| * | | | FindCUDA: Fix object build rule for separate compilation on VS 2013+ (#15697)Dominic Meiser2015-08-201-3/+2
| |/ / / | | | | | | | | | | | | | | | | | | | | The handling of multilevel dependencies has been fixed in Visual Studio 2013. The work around used for VS 2010 and VS 2012 does not work for VS 2013 any more. Switch to normal object build rules for VS 2013 and newer.