[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3398-g18d73f5
Stephen Kelly
steveire at gmail.com
Fri Jul 26 04:34:44 EDT 2013
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 18d73f5ef12b86cbc7d7b24996a1c5039d217ffa (commit)
via 79a7a81327d4e5b7cf9e16021ad4dc98888969eb (commit)
via 6f6391b771712fa25366763793e5331c77f6e96f (commit)
via d8cb47f23c6da075e7e69dc055ca28b676682ad4 (commit)
via f10e64804e13c7e5505ee2a2da5b4384f8616d7a (commit)
via 4f4d69fcc26ac1c528c70ef150ca6f3bb951d5e4 (commit)
via a413a408734c61d8dff400c25912ef43ccb1e657 (commit)
via b60a29eaa1b111393e925eeea9bfa2877430a202 (commit)
from 82933f64d87b6886686cd2aeefe15ad33dbee8bd (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=18d73f5ef12b86cbc7d7b24996a1c5039d217ffa
commit 18d73f5ef12b86cbc7d7b24996a1c5039d217ffa
Merge: 82933f6 79a7a81
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Jul 26 04:34:41 2013 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jul 26 04:34:41 2013 -0400
Merge topic 'minor-cleanups' into next
79a7a81 Docs: Document variables for default visibility values.
6f6391b Docs: Generalize and de-duplicate VISIBILITY_PREFIX docs.
d8cb47f Docs: Trim trailing whitespace in generated doc.
f10e648 Docs: Document existing target property debugging options.
4f4d69f Qt4Macros: Simplify some variable population.
a413a40 Qt4Macros: Remove undefined varible use.
b60a29e Qt4Macros: Remove unneeded generate CONDITION.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=79a7a81327d4e5b7cf9e16021ad4dc98888969eb
commit 79a7a81327d4e5b7cf9e16021ad4dc98888969eb
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Jul 26 09:31:14 2013 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Jul 26 09:37:12 2013 +0200
Docs: Document variables for default visibility values.
diff --git a/Source/cmDocumentVariables.cxx b/Source/cmDocumentVariables.cxx
index 168d1c6..58b7147 100644
--- a/Source/cmDocumentVariables.cxx
+++ b/Source/cmDocumentVariables.cxx
@@ -1520,6 +1520,22 @@ void cmDocumentVariables::DefineVariables(cmake* cm)
"See that target property for additional information.",
false,
"Variables that Control the Build");
+ cm->DefineProperty
+ ("CMAKE_<LANG>_VISIBILITY_PRESET", cmProperty::VARIABLE,
+ "Default value for <LANG>_VISIBILITY_PRESET of targets.",
+ "This variable is used to initialize the "
+ "<LANG>_VISIBILITY_PRESET property on all the targets. "
+ "See that target property for additional information.",
+ false,
+ "Variables that Control the Build");
+ cm->DefineProperty
+ ("CMAKE_VISIBILITY_INLINES_HIDDEN", cmProperty::VARIABLE,
+ "Default value for VISIBILITY_INLINES_HIDDEN of targets.",
+ "This variable is used to initialize the "
+ "VISIBILITY_INLINES_HIDDEN property on all the targets. "
+ "See that target property for additional information.",
+ false,
+ "Variables that Control the Build");
// Variables defined when the a language is enabled These variables will
// also be defined whenever CMake has loaded its support for compiling (LANG)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6f6391b771712fa25366763793e5331c77f6e96f
commit 6f6391b771712fa25366763793e5331c77f6e96f
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Jul 26 09:30:40 2013 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Jul 26 09:37:12 2013 +0200
Docs: Generalize and de-duplicate VISIBILITY_PREFIX docs.
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 189f763..6dde5ed 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -1001,22 +1001,13 @@ void cmTarget::DefineProperties(cmake *cm)
"(such as \"lib\") on a library name.");
cm->DefineProperty
- ("C_VISIBILITY_PRESET", cmProperty::TARGET,
+ ("<LANG>_VISIBILITY_PRESET", cmProperty::TARGET,
"Value for symbol visibility compile flags",
- "The C_VISIBILITY_PRESET property determines the value passed used in "
- "a visibility related compile option, such as -fvisibility=. This "
- "property only has an affect for libraries and executables with "
- "exports. This property is initialized by the value of the variable "
- "CMAKE_C_VISIBILITY_PRESET if it is set when a target is created.");
-
- cm->DefineProperty
- ("CXX_VISIBILITY_PRESET", cmProperty::TARGET,
- "Value for symbol visibility compile flags",
- "The CXX_VISIBILITY_PRESET property determines the value passed used in "
- "a visibility related compile option, such as -fvisibility=. This "
- "property only has an affect for libraries and executables with "
+ "The <LANG>_VISIBILITY_PRESET property determines the value passed in "
+ "a visibility related compile option, such as -fvisibility= for <LANG>. "
+ "This property only has an affect for libraries and executables with "
"exports. This property is initialized by the value of the variable "
- "CMAKE_CXX_VISIBILITY_PRESET if it is set when a target is created.");
+ "CMAKE_<LANG>_VISIBILITY_PRESET if it is set when a target is created.");
cm->DefineProperty
("VISIBILITY_INLINES_HIDDEN", cmProperty::TARGET,
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d8cb47f23c6da075e7e69dc055ca28b676682ad4
commit d8cb47f23c6da075e7e69dc055ca28b676682ad4
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Jul 26 09:28:11 2013 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Jul 26 09:37:12 2013 +0200
Docs: Trim trailing whitespace in generated doc.
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 2cd19cf..78012de 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -4081,7 +4081,7 @@ void cmMakefile::DefineProperties(cmake *cm)
"List of options to pass to the compiler.",
"This property specifies the list of directories given "
"so far for this property. "
- "This property exists on directories and targets. "
+ "This property exists on directories and targets."
"\n"
"The target property values are used by the generators to set "
"the options for the compiler.\n"
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 0b3b785..189f763 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -304,7 +304,7 @@ void cmTarget::DefineProperties(cmake *cm)
"List of options to pass to the compiler.",
"This property specifies the list of options specified "
"so far for this property. "
- "This property exists on directories and targets. "
+ "This property exists on directories and targets."
"\n"
"The target property values are used by the generators to set "
"the options for the compiler.\n"
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f10e64804e13c7e5505ee2a2da5b4384f8616d7a
commit f10e64804e13c7e5505ee2a2da5b4384f8616d7a
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Jul 26 09:26:59 2013 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Jul 26 09:37:12 2013 +0200
Docs: Document existing target property debugging options.
diff --git a/Source/cmDocumentVariables.cxx b/Source/cmDocumentVariables.cxx
index cfd5e76..168d1c6 100644
--- a/Source/cmDocumentVariables.cxx
+++ b/Source/cmDocumentVariables.cxx
@@ -963,9 +963,11 @@ void cmDocumentVariables::DefineVariables(cmake* cm)
"Enables tracing output for target properties.",
"This variable can be populated with a list of properties to generate "
"debug output for when evaluating target properties. Currently it can "
- "only be used when evaluating the INCLUDE_DIRECTORIES target property. "
- "In that case, it outputs a backtrace for each include directory in "
- "the build. Default is unset.",false,"Variables That Change Behavior");
+ "only be used when evaluating the INCLUDE_DIRECTORIES, "
+ "COMPILE_DEFINITIONS and COMPILE_OPTIONS target properties. "
+ "In that case, it outputs a backtrace for each entry in the target "
+ "propertythe build. Default is unset.",
+ false,"Variables That Change Behavior");
// Variables defined by CMake that describe the system
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4f4d69fcc26ac1c528c70ef150ca6f3bb951d5e4
commit 4f4d69fcc26ac1c528c70ef150ca6f3bb951d5e4
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Jul 26 09:35:57 2013 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Jul 26 09:37:12 2013 +0200
Qt4Macros: Simplify some variable population.
diff --git a/Modules/Qt4Macros.cmake b/Modules/Qt4Macros.cmake
index d71ef2a..f1aedd7 100644
--- a/Modules/Qt4Macros.cmake
+++ b/Modules/Qt4Macros.cmake
@@ -113,11 +113,9 @@ macro (QT4_CREATE_MOC_COMMAND infile outfile moc_flags moc_options moc_target)
set (_moc_parameters ${moc_flags} ${moc_options} -o "${outfile}" "${infile}")
string (REPLACE ";" "\n" _moc_parameters "${_moc_parameters}")
- set(targetincludes)
- set(targetdefines)
if(moc_target)
- list(APPEND targetincludes "$<TARGET_PROPERTY:${moc_target},INCLUDE_DIRECTORIES>")
- list(APPEND targetdefines "$<TARGET_PROPERTY:${moc_target},COMPILE_DEFINITIONS>")
+ set(targetincludes "$<TARGET_PROPERTY:${moc_target},INCLUDE_DIRECTORIES>")
+ set(targetdefines "$<TARGET_PROPERTY:${moc_target},COMPILE_DEFINITIONS>")
set(targetincludes "$<$<BOOL:${targetincludes}>:-I$<JOIN:${targetincludes},\n-I>\n>")
set(targetdefines "$<$<BOOL:${targetdefines}>:-D$<JOIN:${targetdefines},\n-D>\n>")
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a413a408734c61d8dff400c25912ef43ccb1e657
commit a413a408734c61d8dff400c25912ef43ccb1e657
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Jul 26 09:34:05 2013 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Jul 26 09:37:12 2013 +0200
Qt4Macros: Remove undefined varible use.
This may have been added in anticipation of processing COMPILE_OPTIONS,
but as moc does not accept them, there is no need for it.
diff --git a/Modules/Qt4Macros.cmake b/Modules/Qt4Macros.cmake
index a6f2e9c..d71ef2a 100644
--- a/Modules/Qt4Macros.cmake
+++ b/Modules/Qt4Macros.cmake
@@ -124,7 +124,7 @@ macro (QT4_CREATE_MOC_COMMAND infile outfile moc_flags moc_options moc_target)
file (GENERATE
OUTPUT ${_moc_parameters_file}
- CONTENT "${targetdefines}${targetincludes}${targetoptions}${_moc_parameters}\n"
+ CONTENT "${targetdefines}${targetincludes}${_moc_parameters}\n"
)
set(targetincludes)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b60a29eaa1b111393e925eeea9bfa2877430a202
commit b60a29eaa1b111393e925eeea9bfa2877430a202
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Jul 26 09:24:22 2013 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Jul 26 09:24:22 2013 +0200
Qt4Macros: Remove unneeded generate CONDITION.
diff --git a/Modules/Qt4Macros.cmake b/Modules/Qt4Macros.cmake
index 5e13b59..a6f2e9c 100644
--- a/Modules/Qt4Macros.cmake
+++ b/Modules/Qt4Macros.cmake
@@ -125,7 +125,6 @@ macro (QT4_CREATE_MOC_COMMAND infile outfile moc_flags moc_options moc_target)
file (GENERATE
OUTPUT ${_moc_parameters_file}
CONTENT "${targetdefines}${targetincludes}${targetoptions}${_moc_parameters}\n"
- CONDITION 1
)
set(targetincludes)
-----------------------------------------------------------------------
Summary of changes:
Modules/Qt4Macros.cmake | 9 +++------
Source/cmDocumentVariables.cxx | 24 +++++++++++++++++++++---
Source/cmMakefile.cxx | 2 +-
Source/cmTarget.cxx | 21 ++++++---------------
4 files changed, 31 insertions(+), 25 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list