[Cmake-commits] CMake branch, next, updated. v2.8.6-2160-gaf62563
David Cole
david.cole at kitware.com
Wed Dec 7 16:31:15 EST 2011
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 af6256309dd2acf91c9b8dd89d375f374d5d0671 (commit)
via 2d1195123ec85ffd04b415914cc5127db918d2c9 (commit)
via 1eca18fd522575126b4d1e4faa3c9437d2f12e22 (commit)
from a286108643fc5768f825060fc25c6cbc47fb7f66 (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=af6256309dd2acf91c9b8dd89d375f374d5d0671
commit af6256309dd2acf91c9b8dd89d375f374d5d0671
Merge: a286108 2d11951
Author: David Cole <david.cole at kitware.com>
AuthorDate: Wed Dec 7 16:31:10 2011 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Dec 7 16:31:10 2011 -0500
Merge topic 'AutomocIncludedDotMocFileHandling' into next
2d11951 Merge branch 'master' into AutomocIncludedDotMocFileHandling
1eca18f automoc: add documentation for CMAKE_AUTOMOC_STRICT_MODE
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2d1195123ec85ffd04b415914cc5127db918d2c9
commit 2d1195123ec85ffd04b415914cc5127db918d2c9
Merge: 1eca18f 9f18f64
Author: David Cole <david.cole at kitware.com>
AuthorDate: Wed Dec 7 16:29:13 2011 -0500
Commit: David Cole <david.cole at kitware.com>
CommitDate: Wed Dec 7 16:29:13 2011 -0500
Merge branch 'master' into AutomocIncludedDotMocFileHandling
Conflicts:
Source/cmTarget.cxx
diff --cc Modules/AutomocInfo.cmake.in
index 293ba64,2c7c724..44f2da2
--- a/Modules/AutomocInfo.cmake.in
+++ b/Modules/AutomocInfo.cmake.in
@@@ -10,5 -11,5 +11,6 @@@ set(AM_QT_MOC_EXECUTABLE "@QT_MOC_EXECU
set(AM_CMAKE_CURRENT_SOURCE_DIR "@CMAKE_CURRENT_SOURCE_DIR@/")
set(AM_CMAKE_CURRENT_BINARY_DIR "@CMAKE_CURRENT_BINARY_DIR@/")
set(AM_QT_VERSION_MAJOR "@QT_VERSION_MAJOR@" )
+ set(AM_Qt5Core_VERSION_MAJOR "@Qt5Core_VERSION_MAJOR@" )
set(AM_TARGET_NAME "@_moc_target_name@")
+set(AM_STRICT_MODE "@_moc_strict_mode@")
diff --cc Source/cmQtAutomoc.cxx
index 349b738,d07f84b..65c7952
--- a/Source/cmQtAutomoc.cxx
+++ b/Source/cmQtAutomoc.cxx
@@@ -200,11 -145,11 +210,12 @@@ void cmQtAutomoc::SetupAutomocTarget(cm
makefile->AddDefinition("_moc_incs", _moc_incs.c_str());
makefile->AddDefinition("_moc_defs", _moc_defs.c_str());
makefile->AddDefinition("_moc_compile_defs", _moc_compile_defs.c_str());
+ makefile->AddDefinition("_moc_options", _moc_options.c_str());
makefile->AddDefinition("_moc_files", _moc_files.c_str());
makefile->AddDefinition("_moc_headers", _moc_headers.c_str());
+ makefile->AddDefinition("_moc_strict_mode", strictMode ? "TRUE" : "FALSE");
- const char* cmakeRoot = makefile->GetDefinition("CMAKE_ROOT");
+ const char* cmakeRoot = makefile->GetSafeDefinition("CMAKE_ROOT");
std::string inputFile = cmakeRoot;
inputFile += "/Modules/AutomocInfo.cmake.in";
std::string outputFile = targetDir;
diff --cc Source/cmTarget.cxx
index 279f626,87f8c5e..276c5e0
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@@ -158,11 -159,21 +159,23 @@@ void cmTarget::DefineProperties(cmake *
"which is compiled as part of the target."
"This property is initialized by the value of the variable "
"CMAKE_AUTOMOC if it is set when a target is created.\n"
+ "Additional command line options for moc can be set via the "
- "AUTOMOC_MOC_OPTIONS property."
- );
++ "AUTOMOC_MOC_OPTIONS property.\n"
+ "By setting the CMAKE_AUTOMOC_STRICT_MODE variable to FALSE the rules "
+ "for searching the files which will be processed by moc can be relaxed. "
+ "See the documentation for this variable for more details.");
cm->DefineProperty
+ ("AUTOMOC_MOC_OPTIONS", cmProperty::TARGET,
+ "Additional options for moc when using automoc (see the AUTOMOC property)",
+ "This property is only used if the AUTOMOC property is set to TRUE for "
+ "this target. In this case, it holds additional command line options "
+ "which will be used when moc is executed during the build, i.e. it is "
+ "equivalent to the optional OPTIONS argument of the qt4_wrap_cpp() "
+ "macro.\n"
+ "By default it is empty.");
+
+ cm->DefineProperty
("BUILD_WITH_INSTALL_RPATH", cmProperty::TARGET,
"Should build tree targets have install tree rpaths.",
"BUILD_WITH_INSTALL_RPATH is a boolean specifying whether to link "
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1eca18fd522575126b4d1e4faa3c9437d2f12e22
commit 1eca18fd522575126b4d1e4faa3c9437d2f12e22
Author: Alex Neundorf <neundorf at kde.org>
AuthorDate: Tue Dec 6 20:42:20 2011 +0100
Commit: Alex Neundorf <neundorf at kde.org>
CommitDate: Tue Dec 6 20:42:20 2011 +0100
automoc: add documentation for CMAKE_AUTOMOC_STRICT_MODE
Alex
diff --git a/Source/cmDocumentVariables.cxx b/Source/cmDocumentVariables.cxx
index f46e1ce..7370ef4 100644
--- a/Source/cmDocumentVariables.cxx
+++ b/Source/cmDocumentVariables.cxx
@@ -508,6 +508,20 @@ void cmDocumentVariables::DefineVariables(cmake* cm)
"Variables That Change Behavior");
cm->DefineProperty
+ ("CMAKE_AUTOMOC_STRICT_MODE", cmProperty::VARIABLE,
+ "Switch between strict and relaxed automoc mode.",
+ "When TRUE, automoc behaves exactly as described in the documentation "
+ "of the AUTOMOC target property. "
+ "When set to FALSE, it accepts more input and tries to find the correct "
+ "input file for moc even if it differs from the documented behaviour. "
+ "In this mode it e.g. also checks whether a header file is intended to "
+ "be processed by moc when a \"foo.moc\" file has been included.\n"
+ "When using Qt4, CMAKE_AUTOMOC_STRICT_MODE is initialized to FALSE. "
+ "It also has to be set to FALSE for KDE4 compatibility.",
+ false,
+ "Variables That Change Behavior");
+
+ cm->DefineProperty
("CMAKE_FIND_LIBRARY_PREFIXES", cmProperty::VARIABLE,
"Prefixes to prepend when looking for libraries.",
"This specifies what prefixes to add to library names when "
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index f7d3ba9..279f626 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -157,7 +157,10 @@ void cmTarget::DefineProperties(cmake *cm)
"files are included in a generated <targetname>_automoc.cpp file, "
"which is compiled as part of the target."
"This property is initialized by the value of the variable "
- "CMAKE_AUTOMOC if it is set when a target is created.");
+ "CMAKE_AUTOMOC if it is set when a target is created.\n"
+ "By setting the CMAKE_AUTOMOC_STRICT_MODE variable to FALSE the rules "
+ "for searching the files which will be processed by moc can be relaxed. "
+ "See the documentation for this variable for more details.");
cm->DefineProperty
("BUILD_WITH_INSTALL_RPATH", cmProperty::TARGET,
-----------------------------------------------------------------------
Summary of changes:
Source/cmDocumentVariables.cxx | 14 ++++++++++++++
Source/cmTarget.cxx | 6 ++++--
2 files changed, 18 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list