kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
29,317 Commits 1 Branch 14 Tags 53 MiB
Commit Graph

29317 Commits

Author SHA1 Message Date
Gregor Jasny d2c2319d64 Replace CMAKE_XCODE_EFFECTIVE_PLATFORMS with call to PlatformIsAppleIos 
Currently the CMAKE_XCODE_EFFECTIVE_PLATFORMS property acts only as
a kind of toggle switch to enable iOS project layout features.
But instead of relying on this undocumented property, better detect
the presence of an iOS SDK directly.
 2015-08-25 21:53:51 +02:00
Brad King cdb9984bff Merge topic 'consistent-empty' 
e876963f Replace '0 == instances.size()' with instances.empty().
44ffb9cd Replace foo.size() pattern with !foo.empty().
8f89f8b1 Replace 'foo.size() != 0' pattern with !foo.empty().
524610f9 Replace 'foo.size() == 0' pattern with foo.empty().
0e14c7ee Replace 'foo.size() > 0' pattern with !foo.empty().
 2015-08-25 15:13:33 -04:00
Brad King 96dafff97f Merge topic 'libarchive-modern-apis' 
e7f93715 Use modern libarchive APIs
 2015-08-25 15:13:31 -04:00
Brad King 90eb6de68f Merge topic 'fphsa-typo' 
64e527db FPHSA: fix typo in documentation
 2015-08-25 15:13:29 -04:00
Brad King 84aa2519b0 Merge topic 'fix-load-command-doc-classification' 
1869eacb Help:  Fix classification of load_command in command TOC.
 2015-08-25 15:13:27 -04:00
Brad King d030a46913 Merge topic 'FindJNI-linux-x32' 
c4d78b8b FindJNI: Add support for x32 architecture on Linux (#15710)
 2015-08-25 15:13:25 -04:00
Brad King 9aeee9c608 Merge topic 'cmState-prop_dir' 
f4150bd8 cmState: Move directory Properties from cmMakefile.
01787547 cmMakefile: Inline GetDefinitions into GetProperty.
 2015-08-25 15:13:23 -04:00
Kitware Robot a8f8848241 CMake Nightly Date Stamp 2015-08-25 00:01:07 -04:00
James Johnston 1869eacb3d Help: Fix classification of load_command in command TOC. 
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".
 2015-08-24 23:09:31 -04:00
Stephen Kelly e876963fc9 Replace '0 == instances.size()' with instances.empty(). 
This is not a pattern.
 2015-08-24 20:47:18 +02:00
Stephen Kelly 44ffb9cdb4 Replace foo.size() pattern with !foo.empty(). 2015-08-24 20:47:18 +02:00
Stephen Kelly 8f89f8b1e9 Replace 'foo.size() != 0' pattern with !foo.empty(). 2015-08-24 20:47:17 +02:00
Stephen Kelly 524610f967 Replace 'foo.size() == 0' pattern with foo.empty(). 2015-08-24 20:47:17 +02:00
Stephen Kelly 0e14c7ee63 Replace 'foo.size() > 0' pattern with !foo.empty(). 2015-08-24 20:47:17 +02:00
Brad King ddb7f280ce Merge topic 'drop-cmsys-std-layer' 
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::*
 2015-08-24 14:28:43 -04:00
Stephen Kelly f4150bd88d cmState: Move directory Properties from cmMakefile. 2015-08-24 20:02:21 +02:00
Stephen Kelly 0178754725 cmMakefile: Inline GetDefinitions into GetProperty. 
It will soon move to cmState.
 2015-08-24 19:48:45 +02:00
Rolf Eike Beer 64e527dbe3 FPHSA: fix typo in documentation 2015-08-24 18:22:13 +02:00
Thorsten Glaser c4d78b8bc0 FindJNI: Add support for x32 architecture on Linux (#15710) 
This architecture uses an amd64 kernel but x32 userland.
Use CMAKE_LIBRARY_ARCHITECTURE to distinguish it for now.
 2015-08-24 10:54:13 -04:00
Páder Rezső e7f937155f Use modern libarchive APIs 
Replace use of deprecated libarchive3 functions with their modern
equivalents.
 2015-08-24 10:40:04 -04:00
Brad King 2370a99400 Merge topic 'cmState-definitions' 
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.
 2015-08-24 10:07:04 -04:00
Brad King 58043880b9 Merge topic 'ios-app-bundle-layout' 
744e6c49 Fix iOS Bundle layouts (#15669)
 2015-08-24 10:07:02 -04:00
Brad King eeeb0eb751 Merge topic 'remove-unused-cmPolicies' 
d8a57148 cmake: Remove unused cmPolicies member.
 2015-08-24 10:07:00 -04:00
Brad King d5d86ecf50 Merge topic 'refactor-progress' 
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.
 2015-08-24 10:06:58 -04:00
Brad King 9135e3707d Merge topic 'generators-use-cmLocalGenerator' 
1f39ee5b cmInstallExportGenerator: Require cmLocalGenerator, not cmMakefile.
c259b830 cmTestGenerator: Require cmLocalGenerator, not cmMakefile.
75e511ee cmInstallFilesGenerator: Require cmLocalGenerator, not cmMakefile.
 2015-08-24 10:06:56 -04:00
Brad King aaf9532bbc Merge topic 'fix-include_directories-BEFORE' 
a4bd3010 include_directories: Fix regression in BEFORE option (#15693)
 2015-08-24 10:06:54 -04:00
Gregor Jasny 744e6c497c Fix iOS Bundle layouts (#15669) 
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.
 2015-08-24 09:50:20 -04:00
Kitware Robot 884c63176f CMake Nightly Date Stamp 2015-08-24 00:01:06 -04:00
Stephen Kelly bff27391a9 cmState: Host variable definitions. 2015-08-23 19:05:11 +02:00
Stephen Kelly d8a5714839 cmake: Remove unused cmPolicies member. 
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)
 2015-08-23 18:28:01 +02:00
Stephen Kelly 3fa1b9641d cmGlobalUnixMakefileGenerator3: Change the progress container key. 2015-08-23 18:05:13 +02:00
Stephen Kelly 55e3927634 cmState: Make it possible to order cmState::Snapshot. 2015-08-23 18:05:13 +02:00
Stephen Kelly 04168cbb59 cmGlobalUnixMakefileGenerator3: Rename member. 2015-08-23 18:05:13 +02:00
Stephen Kelly 2394584ce2 cmGlobalGenerator: Rename progress initializer method. 2015-08-23 18:05:13 +02:00
Stephen Kelly b9eb3cd140 cmGlobalGenerator: Move LG to target map to subclass. 
This is the only user.
 2015-08-23 18:05:01 +02:00
Stephen Kelly f5d2b7a694 cmGlobalGenerator: Remove clearance of map. 
It is always cleared before being re-populated.
 2015-08-23 17:49:11 +02:00
Stephen Kelly 1f39ee5beb cmInstallExportGenerator: Require cmLocalGenerator, not cmMakefile. 2015-08-23 17:46:23 +02:00
Stephen Kelly c259b83026 cmTestGenerator: Require cmLocalGenerator, not cmMakefile. 2015-08-23 17:46:07 +02:00
Stephen Kelly 75e511eeaf cmInstallFilesGenerator: Require cmLocalGenerator, not cmMakefile. 2015-08-23 17:21:27 +02:00
Stephen Kelly 6954c8936f cmState: Add a VariableScope snapshot type. 
Match the scopes currently used in cmMakefile for definitions.
 2015-08-23 17:08:54 +02:00
Stephen Kelly 1fc645bd9c cmState: Add a Base snapshot type. 
For completeness mostly.
 2015-08-23 17:08:54 +02:00
Stephen Kelly 0f070dd3e1 cmMakefile: Decouple the container of cmDefinitions from scoping logic. 
Maintain a Parent tree node for writing to in RaiseScope.
 2015-08-23 17:08:53 +02:00
Stephen Kelly 25e04ddffe cmDefinitions: Implement in terms of cmLinkedTree. 
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.
 2015-08-23 17:08:53 +02:00
Stephen Kelly 4bbe261cd3 cmMakefile: Extract InitializeVarScope method. 2015-08-23 17:08:53 +02:00
Kitware Robot b5f17d1b80 CMake Nightly Date Stamp 2015-08-23 00:01:06 -04:00
Kitware Robot 29c1385675 CMake Nightly Date Stamp 2015-08-22 00:01:07 -04:00
Brad King a4bd30104f include_directories: Fix regression in BEFORE option (#15693) 
Refactoring in commit 6ed9c7e0 (cmState: Host buildsystem properties for
directories, 2015-07-18) broke include_directories(BEFORE).  Fix it and
add a test case.
 2015-08-21 15:21:37 -04:00
Brad King 04e708d8df Remove use of include <cmsys/IOStream.hxx> from KWSys 
We no longer need this compatibility layer for the compilers we support.
 2015-08-21 10:54:57 -04:00
Brad King 86bb2ce757 Merge topic 'improve-variable-help-formatting' 
3bb707f0 Help: Improve formatting of variable documentation
 2015-08-21 09:37:16 -04:00
James Johnston 3bb707f0a1 Help: Improve formatting of variable documentation 
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.
 2015-08-21 09:32:08 -04:00