diff options
| author | Brad King <brad.king@kitware.com> | 2013-01-23 20:10:39 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-01-23 20:10:39 (GMT) |
| commit | c4c52b32730882964b0f0c13762cf2477280ff8b (patch) | |
| tree | 8147df6a621b51a5a4672d95afa111516101335d /Source/cmGlobalGenerator.cxx | |
| parent | a40c4261e6e9eef4fae5266b14a3790ee76f4612 (diff) | |
| parent | 0e35cac3d06bb89faa89ed4bf425f0978e828321 (diff) | |
| download | CMake-c4c52b32730882964b0f0c13762cf2477280ff8b.zip CMake-c4c52b32730882964b0f0c13762cf2477280ff8b.tar.gz CMake-c4c52b32730882964b0f0c13762cf2477280ff8b.tar.bz2 | |
Merge topic 'automoc-object'
0e35cac Automoc: add OBJECT library to QtAutomoc test
cf3faac Automoc: Fix automoc for OBJECT libraries.
Diffstat (limited to 'Source/cmGlobalGenerator.cxx')
| -rw-r--r-- | Source/cmGlobalGenerator.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx index d2baf53..8cd648b 100644 --- a/Source/cmGlobalGenerator.cxx +++ b/Source/cmGlobalGenerator.cxx @@ -1063,7 +1063,8 @@ void cmGlobalGenerator::CreateAutomocTargets() if(target.GetType() == cmTarget::EXECUTABLE || target.GetType() == cmTarget::STATIC_LIBRARY || target.GetType() == cmTarget::SHARED_LIBRARY || - target.GetType() == cmTarget::MODULE_LIBRARY) + target.GetType() == cmTarget::MODULE_LIBRARY || + target.GetType() == cmTarget::OBJECT_LIBRARY) { if(target.GetPropertyAsBool("AUTOMOC") && !target.IsImported()) { |