This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via b97e9ba6a0a5797b70d8225e9111396c25348ef6 (commit)
via 0e35cac3d06bb89faa89ed4bf425f0978e828321 (commit)
via cf3faacad2aff9ac3c9f2d407b1823a75939160e (commit)
from 47483c8f890b0ebf5e1383e98d6c10f3c01041f2 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b97e9ba6a0a5797b70d8225e9111396c25348ef6
commit b97e9ba6a0a5797b70d8225e9111396c25348ef6
Merge: 47483c8 0e35cac
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Jan 15 08:58:54 2013 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Tue Jan 15 08:58:54 2013 -0500
Merge topic 'automoc-object' into next
0e35cac Automoc: add OBJECT library to QtAutomoc test
cf3faac Automoc: Fix automoc for OBJECT libraries.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0e35cac3d06bb89faa89ed4bf425f0978e828321
commit 0e35cac3d06bb89faa89ed4bf425f0978e828321
Author: Yury G. Kudryashov <urkud.ur...@gmail.com>
AuthorDate: Fri Jan 11 13:40:13 2013 +0400
Commit: Yury G. Kudryashov <urkud.ur...@gmail.com>
CommitDate: Tue Jan 15 07:45:46 2013 +0400
Automoc: add OBJECT library to QtAutomoc test
diff --git a/Tests/QtAutomoc/CMakeLists.txt b/Tests/QtAutomoc/CMakeLists.txt
index 5e3686d..855fcf0 100644
--- a/Tests/QtAutomoc/CMakeLists.txt
+++ b/Tests/QtAutomoc/CMakeLists.txt
@@ -13,11 +13,14 @@ add_definitions(-DFOO -DSomeDefine="Barx")
# enable relaxed mode so automoc can handle all the special cases:
set(CMAKE_AUTOMOC_RELAXED_MODE TRUE)
-# create an executable and a library target, both requiring automoc:
+# create an executable and two library targets, each requiring automoc:
add_library(codeeditorLib STATIC codeeditor.cpp)
-add_executable(foo main.cpp calwidget.cpp foo.cpp blub.cpp bar.cpp abc.cpp
xyz.cpp yaf.cpp private_slot.cpp)
+add_library(privateSlot OBJECT private_slot.cpp)
-set_target_properties(foo codeeditorLib PROPERTIES AUTOMOC TRUE)
+add_executable(foo main.cpp calwidget.cpp foo.cpp blub.cpp bar.cpp abc.cpp
+ xyz.cpp yaf.cpp $<TARGET_OBJECTS:privateSlot>)
+
+set_target_properties(foo codeeditorLib privateSlot PROPERTIES AUTOMOC TRUE)
target_link_libraries(foo codeeditorLib ${QT_LIBRARIES} )
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cf3faacad2aff9ac3c9f2d407b1823a75939160e
commit cf3faacad2aff9ac3c9f2d407b1823a75939160e
Author: Yury G. Kudryashov <urkud.ur...@gmail.com>
AuthorDate: Fri Jan 11 12:42:34 2013 +0400
Commit: Yury G. Kudryashov <urkud.ur...@gmail.com>
CommitDate: Tue Jan 15 07:43:04 2013 +0400
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.
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())
{
-----------------------------------------------------------------------
Summary of changes:
Source/cmGlobalGenerator.cxx | 3 ++-
Tests/QtAutomoc/CMakeLists.txt | 9 ++++++---
2 files changed, 8 insertions(+), 4 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
