diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2013-01-11 08:42:34 (GMT) |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2013-01-15 03:43:04 (GMT) |
| commit | cf3faacad2aff9ac3c9f2d407b1823a75939160e (patch) | |
| tree | e9b627c5287fdd433ddcfe46ee89e44e6ca2c8cf /Source | |
| parent | 5929086634e362d03d02124eea5ee14919ae5a0f (diff) | |
| download | CMake-cf3faacad2aff9ac3c9f2d407b1823a75939160e.zip CMake-cf3faacad2aff9ac3c9f2d407b1823a75939160e.tar.gz CMake-cf3faacad2aff9ac3c9f2d407b1823a75939160e.tar.bz2 | |
Automoc: Fix automoc for OBJECT libraries.
Before this patch,
add_library(obj OBJECT helper.cpp)
add_executable(tgt $<TARGET_OBJECTS:obj>)
didn't run automoc on helper.cpp.
Diffstat (limited to 'Source')
| -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 d030aa7..b431705 100644 --- a/Source/cmGlobalGenerator.cxx +++ b/Source/cmGlobalGenerator.cxx @@ -1075,7 +1075,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()) { |