Stephen Kelly
5f05b56284
cmGlobalGenerator: Refactor IsExcluded.
...
Make it easier to convert it to a loop.
2015-08-24 20:03:29 +02:00
Stephen Kelly
95925a60fc
cmGlobalGenerator: Don't use else after return.
2015-08-24 20:03:29 +02: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
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
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
Brad King
badde9c2a1
Merge topic 'modules-no-soname'
...
f799ffb5
Do not set SONAME for MODULE library targets (#15705 )
899458ab
Tests: Cover NO_SONAME property for SHARED libraries
2015-08-21 09:29:06 -04:00
Brad King
def5795bac
Merge topic 'FindCUDA-vs2013-separate-compilation'
...
9b2f6992
FindCUDA: Fix object build rule for separate compilation on VS 2013+ (#15697 )
2015-08-21 09:29:04 -04:00
Brad King
c450686ef2
Merge topic 'OUTPUT_NAME-genex-no-recursion'
...
3c37d264
cmGeneratorTarget: Avoid recursion in GetOutputName method
2015-08-21 09:29:02 -04:00
Brad King
870d839f0d
Merge topic 'sublime-msvc-includes'
...
c66835fc
Extra Generator: Populate MSVC system include paths from environment (#15597 )
2015-08-21 09:29:00 -04:00
Brad King
cecd0d186d
Merge topic 'vs-fix-obj-extension'
...
3e94f94b
cmLocalVisualStudioGenerator: Use computed .obj extension (#13685 )
2015-08-21 09:28:58 -04:00
Brad King
f9865743ed
Merge topic 'hp-ux-itanium-shared-libs'
...
625225bb
HP-UX: Do not use ".sl" extension for shared libs on Itanium
2015-08-21 09:28:55 -04:00
Brad King
4ae9362b5b
Merge topic 'get-filename-component-base-dir'
...
e89ea3d1
get_filename_component: Teach new BASE_DIR parameter.
2015-08-21 09:28:53 -04:00
Brad King
162e7b5675
Merge topic 'determine-compiler-CMP0054'
...
dc8822f0
CMakeDetermine{C,CXX}Compiler: Avoid if() auto-dereferene in quoted arguments
2015-08-21 09:28:50 -04:00
Kitware Robot
3755250f8e
CMake Nightly Date Stamp
2015-08-21 00:01:09 -04:00
Dominic Meiser
9b2f69925a
FindCUDA: Fix object build rule for separate compilation on VS 2013+ ( #15697 )
...
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.
2015-08-20 11:52:11 -04:00
Felix Geyer
f799ffb5cb
Do not set SONAME for MODULE library targets ( #15705 )
...
The SONAME field is only useful for shared libraries that application
link against.
2015-08-20 10:45:09 -04:00
Brad King
899458ab20
Tests: Cover NO_SONAME property for SHARED libraries
...
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.
2015-08-20 10:38:34 -04:00
Robert Goulet
3c37d2642d
cmGeneratorTarget: Avoid recursion in GetOutputName method
...
Since support for generator expressions was added to OUTPUT_NAME it is
possible for project code to cause recursion in this method by using a
$<TARGET_FILE> genex. Detect and reject such cases.
2015-08-20 09:56:45 -04:00
Matt McCormick
dc8822f0a7
CMakeDetermine{C,CXX}Compiler: Avoid if() auto-dereferene in quoted arguments
...
Exposed by a CMP0054 warning with code like:
cmake_minimum_required(VERSION 2.8.9 FATAL_ERROR)
project(MyProj NONE)
enable_language(C)
enable_language(CXX)
While at it, use STREQUAL for testing the compiler id against "GNU".
Suggested-by: Rolf Eike Beer <eike@sf-mail.de>
2015-08-20 09:35:16 -04:00
Kitware Robot
e72a5b2c0b
CMake Nightly Date Stamp
2015-08-20 00:01:07 -04:00
Kitware Robot
404d16e7bc
CMake Nightly Date Stamp
2015-08-19 00:01:08 -04:00
Gregor Jasny
c66835fc37
Extra Generator: Populate MSVC system include paths from environment ( #15597 )
2015-08-18 22:30:55 +02:00