summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'fix-COMPATIBLE_INTERFACE-link-libraries'Brad King2013-01-241-2/+8
|\ | | | | | | | | 6fbe3ce Exclude the LINK_LIBRARIES related properties from INTERFACE evaluation.
| * Exclude the LINK_LIBRARIES related properties from INTERFACE evaluation.Stephen Kelly2013-01-241-2/+8
| | | | | | | | | | | | These interface-related link-libraries properties are used to determine the value of the other INTERFACE properties, so we were getting infinite recursion and segfaults otherwise.
* | Merge topic 'cmMakefile-comment-typos'Brad King2013-01-241-3/+3
|\ \ | | | | | | | | | | | | 3853a6c spell: fix a few typos in comments
| * | spell: fix a few typos in commentsYury G. Kudryashov2013-01-231-3/+3
| | |
* | | CMake Nightly Date StampKitware Robot2013-01-241-1/+1
| |/ |/|
* | Merge topic 'disallow-IMPORTED-interface-porcelain'Brad King2013-01-237-34/+13
|\ \ | | | | | | | | | | | | | | | b98d14d Disallow porcelain to populate includes and defines of IMPORTED targets. 48a4cf2 Revert "Allow target_link_libraries with IMPORTED targets."
| * | Disallow porcelain to populate includes and defines of IMPORTED targets.Stephen Kelly2013-01-216-20/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With similar reasoning to the parent commit, as downstreams, we can't determine what $<CONFIG> generator expressions would be appropriate. Upstream would have populated the INTERFACE_INCLUDE_DIRECTORIES with config-specific generator expressions, possibly appropriate for their DEBUG_CONFIGURATIONS. In theory, if we would add include directories for a DEBUG intent, we would have to match the upstream configurations for that. Rather than attempting to discover the appropriate configurations at this time, simplify the feature instead. The use of IMPORTED targets with these commands could still be added in the future if targets would export their DEBUG_CONFIGURATIONS somehow.
| * | Revert "Allow target_link_libraries with IMPORTED targets."Stephen Kelly2013-01-211-14/+0
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 9cfe4f1b769597bd9ba179eba46572a9df27f64c. It turns out that correctly adding the content to the IMPORTED_LINK_INTERFACE_LIBARIES_<CONFIG> of an upstream target from the buildsystem of a downstream project is not simple. If upstream had added the INTERFACE content, the config-specific properties would be determined by the DEBUG_CONFIGURATIONS of upstream. As downstream, we don't have any information about what the DEBUG_CONFIGURATIONS of upstream were, so we can't determine which configuration-specific properties to populate. The best we can do is add it to all of them or add it to the ones downstream considers to be DEBUG_CONFIGURATIONS, neither of which is a good solution. So, removing the porcelain API for that is the best approach. A human can still determine which properties to populate and use the set_property API to populate the desired properies. Another solution to this would be for upstream targets to publish what they consider DEBUG_CONFIGURATIONS, but that can be added in a future release.
* | Merge topic 'clean-include-dirs-debugging'Brad King2013-01-239-48/+114
|\ \ | | | | | | | | | | | | | | | | | | | | | 6063fef Output include directories as LOG messages, not warnings. aa66748 Specify the target whose includes are being listed. d70204a Only output includes once after the start of 'generate-time' when debugging. 0d46e9a Store includes from the same include_directories call together.
| * | Output include directories as LOG messages, not warnings.Stephen Kelly2013-01-211-0/+4
| | |
| * | Specify the target whose includes are being listed.Stephen Kelly2013-01-211-2/+2
| | |
| * | Only output includes once after the start of 'generate-time' when debugging.Stephen Kelly2013-01-215-1/+17
| | | | | | | | | | | | | | | | | | During configure-time, GetIncludeDirectories may be called too, for example if using the export() command. As the content can be different, it should be output each time then.
| * | Store includes from the same include_directories call together.Stephen Kelly2013-01-215-45/+91
| | | | | | | | | | | | | | | | | | Otherwise, we get a separate IncludeDirectoriesEntry for each include, and that causes unnecessary and confusing splitting in the output when debugging the INCLUDE_DIRECTORIES property.
* | | Merge topic 'export-new-style-files'Brad King2013-01-232-72/+72
|\ \ \ | | | | | | | | | | | | | | | | 02d4e53 Generate new-style cmake code during export.
| * | | Generate new-style cmake code during export.Stephen Kelly2013-01-202-72/+72
| | | | | | | | | | | | | | | | Use empty end*() commands and lowercase commands.
* | | | Merge topic 'fix-LINK_LIBRARIES-population'Brad King2013-01-231-2/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | d7f1520 Don't wrap all targets in LINK_LIBRARIES in a TARGET_NAME genex.
| * | | | Don't wrap all targets in LINK_LIBRARIES in a TARGET_NAME genex.Stephen Kelly2013-01-201-2/+3
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is not necessary and the current state is unintentional. Before this patch, target_link_libraries(foo bar) causes the LINK_LIBRARIES property of foo to contain $<TARGET_NAME:bar> instead of just bar
* | | | Merge topic 'qt4-autolink-qtmain'Brad King2013-01-236-0/+135
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | e3b5eb6 Automatically link to the qtmain library when linking to QtCore. 6c8d8af Add the $<TARGET_POLICY> expression
| * | | | Automatically link to the qtmain library when linking to QtCore.Stephen Kelly2013-01-235-2/+35
| | | | | | | | | | | | | | | | | | | | | | | | | When using QAxServer, ensure that the qtmain library is excluded by reporting an error at CMake time if it is not.
| * | | | Add the $<TARGET_POLICY> expressionStephen Kelly2013-01-172-0/+102
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This new expression allows checking how a policy was set when a target was created. That information is only recorded for a subset of policies, so a whitelist is used.
* | | | | Merge topic 'fix-COMPATIBLE_INTERFACE-properties'Brad King2013-01-239-4/+178
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 830246e Export the COMPATIBLE_INTERFACE_BOOL content properties bd82bb4 Clear the link information in ClearLinkMaps. e987991 Make INTERFACE determined properties readable in generator expressions. d9afacc Exit early if we find an inconsistent property. 1800f70 Populate the link information cache before checking dependent properties.
| * | | | | Export the COMPATIBLE_INTERFACE_BOOL content propertiesStephen Kelly2013-01-214-0/+78
| | | | | |
| * | | | | Clear the link information in ClearLinkMaps.Stephen Kelly2013-01-211-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The cache here needs to be cleared if GetLinkInformation is called at configure-time, such as during an export(). The next commit does exactly that, and without this patch, the LinkLanguage test would fail.
| * | | | | Make INTERFACE determined properties readable in generator expressions.Stephen Kelly2013-01-205-0/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The properties are evaluated as link-dependent interface properties when evaluating the generator expressions.
| * | | | | Exit early if we find an inconsistent property.Stephen Kelly2013-01-181-0/+3
| |/ / / / | | | | | | | | | | | | | | | Further messages about inconsistency are distracting.
| * | | | Populate the link information cache before checking dependent properties.Stephen Kelly2013-01-161-4/+4
| | | | | | | | | | | | | | | | | | | | The dependent properties check can require the link information.
* | | | | Merge topic 'xcode-duplicate-flags-13354'Brad King2013-01-231-5/+10
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | f447db7 XCode generator won't infinitely parse compiler flags (bug #13354).
| * | | | | XCode generator won't infinitely parse compiler flags (bug #13354).Robert Maynard2013-01-181-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When parsing the compiler flag list we reduce the search space on each iteration to be the subset of the string we hadn't searched before.
* | | | | | Merge topic 'fix-target_include_directories-genex'Brad King2013-01-231-0/+12
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 24dcf0c Make sure generator expressions can be used with target_include_directories.
| * | | | | | Make sure generator expressions can be used with target_include_directories.Stephen Kelly2013-01-161-0/+12
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | Handle the case that a generator expression is used before treating a non-target as an error.
* | | | | | Merge topic 'automoc-object'Brad King2013-01-231-1/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0e35cac Automoc: add OBJECT library to QtAutomoc test cf3faac Automoc: Fix automoc for OBJECT libraries.
| * | | | | | Automoc: Fix automoc for OBJECT libraries.Yury G. Kudryashov2013-01-151-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before this patch, add_library(obj OBJECT helper.cpp) add_executable(tgt $<TARGET_OBJECTS:obj>) didn't run automoc on helper.cpp.
* | | | | | | CMake Nightly Date StampKitware Robot2013-01-231-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2013-01-221-1/+1
| |_|_|_|_|/ |/| | | | |
* | | | | | CMake Nightly Date StampKitware Robot2013-01-211-1/+1
| |_|_|_|/ |/| | | |
* | | | | CMake Nightly Date StampKitware Robot2013-01-201-1/+1
| |_|_|/ |/| | |
* | | | CMake Nightly Date StampKitware Robot2013-01-191-1/+1
| |_|/ |/| |
* | | CMake Nightly Date StampKitware Robot2013-01-181-1/+1
| | |
* | | CMake Nightly Date StampKitware Robot2013-01-171-1/+1
| |/ |/|
* | CMake Nightly Date StampKitware Robot2013-01-161-1/+1
| |
* | Merge topic 'test-export-iface-genex'Brad King2013-01-1510-48/+131
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1d74ba2 Test evaluation target via export for generator expressions 522bdac Export the INTERFACE_PIC property. 4ee872c Make the BUILD_INTERFACE of export()ed targets work. 1d47cd9 Add a test for the interfaces in targets exported from the build tree. 6c828f9 Move the exported check for file existence. cfd4f0a Move the exported check for dependencies of targets d8fe1fc Only generate one check per missing target. f623d37 Don't write a comment in the export file without the code. b279f2b Strip consecutive semicolons when preprocessing genex strings.
| * | Export the INTERFACE_PIC property.Stephen Kelly2013-01-154-0/+18
| | |
| * | Make the BUILD_INTERFACE of export()ed targets work.Stephen Kelly2013-01-154-13/+31
| | | | | | | | | | | | | | | The existing BUILD_INTERFACE code is executed at generate time, which is too late for export().
| * | Move the exported check for file existence.Stephen Kelly2013-01-151-2/+2
| | | | | | | | | | | | | | | Check only once, in the Config.cmake file, instead of once in each Config-<cfg>.cmake file.
| * | Move the exported check for dependencies of targetsStephen Kelly2013-01-156-20/+27
| | | | | | | | | | | | | | | Check only once, in the Config.cmake file, instead of once in each Config-<cfg>.cmake file.
| * | Only generate one check per missing target.Stephen Kelly2013-01-151-11/+15
| | |
| * | Don't write a comment in the export file without the code.Stephen Kelly2013-01-151-0/+4
| | |
| * | Strip consecutive semicolons when preprocessing genex strings.Stephen Kelly2013-01-151-2/+34
| | |
* | | Merge topic 'update-kwsys'Brad King2013-01-154-43/+259
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | e2c756f Merge branch 'upstream-kwsys' into update-kwsys 4ba0ac7 KWSys 2013-01-14 (6fa1c99f) 6f57a90 Merge branch 'upstream-kwsys' into update-kwsys 6318834 KWSys 2013-01-10 (608d6b47)
| * | | Merge branch 'upstream-kwsys' into update-kwsysBrad King2013-01-144-37/+129
| | | |