Stephen Kelly
9f2dca805c
Move GetLocation to cmGeneratorTarget.
2015-07-27 21:58:50 +02:00
Stephen Kelly
c7a8e74b8c
Always access target location from a cmGeneratorTarget instance.
2015-07-27 21:58:50 +02:00
Stephen Kelly
5b60eaf619
cmTarget: Restore the ImportedGetLocation method.
...
It was removed in commit f154475b
(cmTarget: Refactor GetLocation
API, 2014-03-08), but it is more readable for targets we know are
imported.
2015-07-27 21:58:50 +02:00
Stephen Kelly
50b17a6112
cmIncludeCommand: Populate the cmGeneratorTargets in deprecated path.
2015-07-27 21:58:50 +02:00
Stephen Kelly
ba26685882
cmTarget: Create cmGeneratorTargets before reading deprecated LOCATION.
...
The intention is to move generation-semantic cmTarget API to cmGeneratorTarget
and then use the latter for generator expressions.
This means that each time we read a deprecated LOCATION property, we have to
clear and re-populate the container. That must be done each time because the
result can change through the configure process, which is why this is
deprecated in the first place.
2015-07-27 21:58:49 +02:00
Stephen Kelly
5ab3a94651
cmTarget: Inline GetLocation into deprecated callers.
2015-07-27 21:58:49 +02:00
Stephen Kelly
496f4cd07d
cmGlobalGenerator: Create cmGeneratorTargets before QtAutomoc.
...
Add cmGeneratorTargets as needed in the QtAutomoc processing.
2015-07-27 21:58:49 +02:00
Stephen Kelly
de80993a20
cmGlobalGenerator: Create cmGeneratorTargets earlier.
2015-07-27 21:58:49 +02:00
Stephen Kelly
611220f77a
cmTarget: Use reliable test for CMP0024 and CMP0026 OLD.
...
Check whether the Makefile is fully configured instead of checking
whether generator targets exist.
2015-07-27 21:58:49 +02:00
Stephen Kelly
bbad6ba537
cmLocalGenerator: Remove unused AddCustomCommandToCreateObject method.
2015-07-27 21:58:48 +02:00
Stephen Kelly
e4dc83ade5
cmLocalGenerator: Remove unused AddBuildTargetRule method.
2015-07-27 21:58:47 +02:00
Stephen Kelly
72f43fa13d
cmLocalGenerator: Remove CreateCustomTargetsAndCommands method.
...
It loops over cmGeneratorTargets, but at the point it is called, there are no
cmGeneratorTargets. This must be dead code.
2015-07-27 21:57:29 +02:00
Stephen Kelly
58811998fb
cmGlobalGenerator: Add global targets at the end of Configure.
...
Rather than at the start of Generate.
2015-07-27 21:57:28 +02:00
Stephen Kelly
57a69f9341
cmGlobalGenerator: Extract method to create generator objects.
2015-07-27 20:09:39 +02:00
Stephen Kelly
0e0258c8b9
cmGlobalGenerator: Split creation of generator object from initialization.
2015-07-27 20:09:38 +02:00
Stephen Kelly
a8e5d838ed
cmCPackPropertiesGenerator: Require cmLocalGenerator in API.
2015-07-27 20:09:38 +02:00
Stephen Kelly
d568eefe10
cmCustomCommandGenerator: Require cmLocalGenerator in API.
2015-07-27 20:09:38 +02:00
Kitware Robot
26d1a9d356
CMake Nightly Date Stamp
2015-07-25 00:01:05 -04:00
Kitware Robot
d546133d49
CMake Nightly Date Stamp
2015-07-24 00:01:07 -04:00
Brad King
b98ded7644
Merge branch 'release'
2015-07-23 13:25:52 -04:00
Brad King
3a0db0223b
CMake 3.3.0
2015-07-23 08:49:45 -04:00
Brad King
e76a950c88
Merge branch 'release'
2015-07-23 08:48:29 -04:00
Brad King
afed519337
Merge topic 'osx-iframework'
...
e68f0cb3
OS X: Use -iframework with AppleClang only on version >= 4.2
2015-07-23 08:47:23 -04:00
Brad King
51f818bf24
Merge topic 'test-OBJECT_DEPENDS'
...
783c3757
Tests: Extend BuildDepends test to cover OBJECT_DEPENDS
2015-07-23 08:47:21 -04:00
Kitware Robot
900554b021
CMake Nightly Date Stamp
2015-07-23 00:01:06 -04:00
Brad King
783c375766
Tests: Extend BuildDepends test to cover OBJECT_DEPENDS
...
The actual file timestamp dependency is known to not work on
Visual Studio or Xcode generators. Tolerate such failure for
these generators (Tests/CustomCommand already covers using
OBJECT_DEPENDS to pull a custom command into a target, and
that still works with these generators).
2015-07-22 11:37:47 -04:00
Brad King
e00e8713de
Merge topic 'export-no-custom-target'
...
7e9f908e
export: Reject custom target exports earlier (#15657 )
3b09398a
Tests: Teach RunCMake.export to enable languages only when needed
2015-07-22 11:04:32 -04:00
Brad King
4c3d431210
Merge topic 'target-directory-properties'
...
45c5f8ca
Add SOURCE_DIR and BINARY_DIR target properties
2015-07-22 11:04:30 -04:00
Brad King
90b3b5e42c
Merge topic 'FindBZip2-check-with-prototype'
...
23876eda
FindBZip2: Check BZIP2_NEED_PREFIX with real prototype
2015-07-22 11:04:28 -04:00
Brad King
669922bde8
Merge branch 'osx-iframework' into release
2015-07-22 09:51:37 -04:00
Brad King
e68f0cb3d4
OS X: Use -iframework with AppleClang only on version >= 4.2
...
Since commit v3.1.0-rc1~564^2 (OS X: Use -iframework for system
framework directories, 2014-05-05) we test the version of Clang to see
if it supports -iframework. Fix the version test used for AppleClang
since it uses a different version scheme than upstream Clang.
2015-07-22 09:04:04 -04:00
Brad King
59678037a9
Merge branch 'release'
2015-07-22 08:36:34 -04:00
Brad King
b9fba34592
Merge branch 'vs-compiler-feature-2015-update' into release
2015-07-22 08:35:46 -04:00
Brad King
a398acd02f
Revert "CMake 3.3.0"
...
This reverts commit 0e3cfc134c
.
Due to VS 2015 RTM being released, additional changes are needed
to CMake 3.3.
2015-07-22 08:35:21 -04:00
Brad King
02e5eba17d
Merge topic 'vs-compiler-feature-2015-update'
...
c2d590c9
Features: Update MSVC features for VS 2015 RTM
2015-07-22 08:31:40 -04:00
Kitware Robot
91d2497286
CMake Nightly Date Stamp
2015-07-22 00:01:06 -04:00
Brad King
7e9f908ef5
export: Reject custom target exports earlier ( #15657 )
...
Diagnose and reject custom targets given to the export() command
immediately. Previously we would generate an internal error later.
2015-07-21 14:39:10 -04:00
Brad King
3b09398ae2
Tests: Teach RunCMake.export to enable languages only when needed
2015-07-21 14:29:10 -04:00
Clifford Yapp
45c5f8cad2
Add SOURCE_DIR and BINARY_DIR target properties
...
This will allow project code to recover the directory information about
where a target was created.
2015-07-21 14:19:35 -04:00
Ralf Habacker
23876eda9f
FindBZip2: Check BZIP2_NEED_PREFIX with real prototype
...
Run our check for the '_' prefix using a bzip2 API function as declared
with a prototype in the real header file. This is needed in case the
function is provided in a DLL import library where the symbol name may
not match without proper markup from the header.
2015-07-21 14:00:06 -04:00
Brad King
c2d590c957
Features: Update MSVC features for VS 2015 RTM
...
VS 2015 RTM completed support for constexpr and attribute features.
Update our feature table and test accordingly.
2015-07-21 12:56:47 -04:00
Brad King
265b9db7c2
Merge branch 'release'
2015-07-21 11:16:13 -04:00
Brad King
863175742b
Merge topic 'doc-CMakeExpandImportedTargets-deprecated'
...
dec8d1cc
Help: Add notes for topic 'doc-CMakeExpandImportedTargets-deprecated'
2015-07-21 09:25:33 -04:00
Brad King
dec8d1ccf8
Help: Add notes for topic 'doc-CMakeExpandImportedTargets-deprecated'
2015-07-21 09:23:42 -04:00
Brad King
500ce3f113
Merge topic 'KDE4-NO_POLICY_SCOPE'
...
4572d8b3
KDE4: Find the Internal package with NO_POLICY_SCOPE.
2015-07-21 09:22:25 -04:00
Brad King
5b2754d41f
Merge topic 'remove-special-MACROS-handling'
...
41bb831f
cmMakefile: Remove special handling of MACROS property.
2015-07-21 09:22:23 -04:00
Brad King
e13c189743
Merge topic 'remove-special-LINK_DIRECTORIES-handling'
...
881613c4
cmMakefile: Remove special handling of LINK_DIRECTORIES property.
35734260
cmMakefile: Inline only use of GetLinkDirectories.
2015-07-21 09:22:21 -04:00
Brad King
ae64efa1ce
Merge topic 'cmState-Directory'
...
9ebc7502
cmState: Extract a Directory class.
27ec21db
cmState: Forward-declare a type earlier.
2015-07-21 09:22:19 -04:00
Brad King
93b393e74c
Merge topic 'remove-Properties-accessor'
...
c6055d9d
cmMakefile: Remove GetProperties method.
cbe3ee58
cmMakefile: Add a PropertyKeys accessor.
2015-07-21 09:22:17 -04:00
Brad King
64aa41b248
Merge topic 'clean-up-include_regular_expression'
...
4efda261
cmMakefile: Remove special handling of INCLUDE_REGULAR_EXPRESSION.
2015-07-21 09:22:15 -04:00