[Cmake-commits] CMake branch, next, updated. v2.8.6-1732-gd86be11
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 d86be11b853ef01f6526d19f3bd24f65bec2d054 (commit) via 1ecc55aa7b95a487996654e81d6493e7b72961c0 (commit) from 768b869bc84effce48a4cd7ac7a4ae858f869813 (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=d86be11b853ef01f6526d19f3bd24f65bec2d054 commit d86be11b853ef01f6526d19f3bd24f65bec2d054 Merge: 768b869 1ecc55a Author: Alexander Neundorf neund...@kde.org AuthorDate: Tue Nov 1 09:03:06 2011 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Nov 1 09:03:06 2011 -0400 Merge topic 'DontCrashAutomocWithEmptyCompileDefs' into next 1ecc55a Automoc: fix the fix, need to use std::string, not just char* pointer http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1ecc55aa7b95a487996654e81d6493e7b72961c0 commit 1ecc55aa7b95a487996654e81d6493e7b72961c0 Author: Alex Neundorf neund...@kde.org AuthorDate: Tue Nov 1 13:59:14 2011 +0100 Commit: Alex Neundorf neund...@kde.org CommitDate: Tue Nov 1 13:59:14 2011 +0100 Automoc: fix the fix, need to use std::string, not just char* pointer We need to take a copy of the property values, since the returned char* pointer is reused by the following GetProperty() calls Alex diff --git a/Source/cmQtAutomoc.cxx b/Source/cmQtAutomoc.cxx index fdc19e4..e9cc9d1 100644 --- a/Source/cmQtAutomoc.cxx +++ b/Source/cmQtAutomoc.cxx @@ -124,18 +124,21 @@ void cmQtAutomoc::SetupAutomocTarget(cmTarget* target) } } - const char* _moc_incs = makefile-GetProperty(INCLUDE_DIRECTORIES); - const char* _moc_defs = makefile-GetProperty(DEFINITIONS); - const char* _moc_compile_defs = makefile-GetProperty(COMPILE_DEFINITIONS); + const char* tmp = makefile-GetProperty(INCLUDE_DIRECTORIES); + std::string _moc_incs = (tmp!=0 ? tmp : ); + tmp = makefile-GetProperty(DEFINITIONS); + std::string _moc_defs = (tmp!=0 ? tmp : ); + tmp = makefile-GetProperty(COMPILE_DEFINITIONS); + std::string _moc_compile_defs = (tmp!=0 ? tmp : ); + // forget the variables added here afterwards again: cmMakefile::ScopePushPop varScope(makefile); static_castvoid(varScope); makefile-AddDefinition(_moc_target_name, automocTargetName.c_str()); - makefile-AddDefinition(_moc_incs, _moc_incs!=0 ? _moc_incs : ); - makefile-AddDefinition(_moc_defs, _moc_defs!=0 ? _moc_defs : ); - makefile-AddDefinition(_moc_compile_defs, - _moc_compile_defs!=0 ? _moc_compile_defs : ); + 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_files, _moc_files.c_str()); makefile-AddDefinition(_moc_headers, _moc_headers.c_str()); --- Summary of changes: Source/cmQtAutomoc.cxx | 17 ++--- 1 files changed, 10 insertions(+), 7 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.6-1739-g6b93e43
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 6b93e43277c4ddf50a549f1d7e0e80e621315a57 (commit) via 13d19468d03bfea1b886c5473e8fcafa09cf2e3a (commit) via 5e1c2f81a76943cce994f133fca71966aa35c1b4 (commit) from fa8b353a9e401daf87a19f2b62279587e2ae3d86 (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=6b93e43277c4ddf50a549f1d7e0e80e621315a57 commit 6b93e43277c4ddf50a549f1d7e0e80e621315a57 Merge: fa8b353 13d1946 Author: Brad King brad.k...@kitware.com AuthorDate: Tue Nov 1 10:50:16 2011 -0400 Commit: Brad King brad.k...@kitware.com CommitDate: Tue Nov 1 10:50:16 2011 -0400 Merge branch 'master' into next --- Summary of changes: Source/kwsys/CommandLineArguments.cxx |2 +- Source/kwsys/SystemInformation.cxx| 45 ++-- Source/kwsys/SystemTools.cxx |8 ++ Source/kwsys/kwsysDateStamp.cmake |4 +- 4 files changed, 31 insertions(+), 28 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.6-1741-ga476a91
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 a476a91a749d49c8f75da0ffbc2ee1fd3f882b8c (commit)
via b0f0b3e4405cb663fd5757441f556ee6cd3fac8c (commit)
from 6b93e43277c4ddf50a549f1d7e0e80e621315a57 (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=a476a91a749d49c8f75da0ffbc2ee1fd3f882b8c
commit a476a91a749d49c8f75da0ffbc2ee1fd3f882b8c
Merge: 6b93e43 b0f0b3e
Author: David Cole david.c...@kitware.com
AuthorDate: Tue Nov 1 12:02:21 2011 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Nov 1 12:02:21 2011 -0400
Merge topic 'fix-12549-one-more-SCC-setting' into next
b0f0b3e VS: Add VS_SCC_AUXPATH target property (#12549)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b0f0b3e4405cb663fd5757441f556ee6cd3fac8c
commit b0f0b3e4405cb663fd5757441f556ee6cd3fac8c
Author: Robert Dailey rcdai...@gmail.com
AuthorDate: Mon Oct 31 19:04:08 2011 -0500
Commit: David Cole david.c...@kitware.com
CommitDate: Tue Nov 1 11:29:08 2011 -0400
VS: Add VS_SCC_AUXPATH target property (#12549)
Maps to SccAuxPath tag in VCPROJ files.
diff --git a/Source/cmLocalVisualStudio7Generator.cxx
b/Source/cmLocalVisualStudio7Generator.cxx
index d9b2772..ae70759 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -1811,11 +1811,18 @@ void
cmLocalVisualStudio7Generator::WriteProjectSCC(std::ostream fout,
const char* vsProjectname = target.GetProperty(VS_SCC_PROJECTNAME);
const char* vsLocalpath = target.GetProperty(VS_SCC_LOCALPATH);
const char* vsProvider = target.GetProperty(VS_SCC_PROVIDER);
+
if(vsProvider vsLocalpath vsProjectname)
{
fout \tSccProjectName=\ vsProjectname \\n
\tSccLocalPath=\ vsLocalpath \\n
\tSccProvider=\ vsProvider \\n;
+
+const char* vsAuxPath = target.GetProperty(VS_SCC_AUXPATH);
+if(vsAuxPath)
+ {
+ fout \tSccAuxPath=\ vsAuxPath \\n;
+ }
}
}
diff --git a/Source/cmSetTargetPropertiesCommand.h
b/Source/cmSetTargetPropertiesCommand.h
index 320378d..f001a11 100644
--- a/Source/cmSetTargetPropertiesCommand.h
+++ b/Source/cmSetTargetPropertiesCommand.h
@@ -140,7 +140,8 @@ public:
the target in an IDE like visual studio. VS_KEYWORD can be set
to change the visual studio keyword, for example QT integration
works better if this is set to Qt4VSv1.0.\n
-VS_SCC_PROJECTNAME, VS_SCC_LOCALPATH, VS_SCC_PROVIDER can be set
+VS_SCC_PROJECTNAME, VS_SCC_LOCALPATH, VS_SCC_PROVIDER and
+VS_SCC_AUXPATH can be set
to add support for source control bindings in a Visual Studio
project file.\n
VS_GLOBAL_variable can be set to add a Visual Studio
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index f7d3ba9..6bf7ec9 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -1011,7 +1011,7 @@ void cmTarget::DefineProperties(cmake *cm)
provider property.);
cm-DefineProperty
(VS_SCC_LOCALPATH, cmProperty::TARGET,
- Visual Studio Source Code Control Provider.,
+ Visual Studio Source Code Control Local Path.,
Can be set to change the visual studio source code control
local path property.);
cm-DefineProperty
@@ -1020,6 +1020,11 @@ void cmTarget::DefineProperties(cmake *cm)
Can be set to change the visual studio source code control
project name property.);
cm-DefineProperty
+(VS_SCC_AUXPATH, cmProperty::TARGET,
+ Visual Studio Source Code Control Aux Path.,
+ Can be set to change the visual studio source code control
+ auxpath property.);
+ cm-DefineProperty
(VS_GLOBAL_variable, cmProperty::TARGET,
Visual Studio project-specific global variable.,
Tell the Visual Studio generator to set the global variable
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx
b/Source/cmVisualStudio10TargetGenerator.cxx
index 551b0ad..45a79c8 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -182,7 +182,7 @@ void cmVisualStudio10TargetGenerator::Generate()
const char* vsLocalPath = this-Target-GetProperty(VS_SCC_LOCALPATH);
const char* vsProvider = this-Target-GetProperty(VS_SCC_PROVIDER);
- if ( vsProjectName vsLocalPath vsProvider)
+ if( vsProjectName vsLocalPath vsProvider )
{
this-WriteString(SccProjectName, 2);
(*this-BuildFileStream) cmVS10EscapeXML(vsProjectName)
@@ -193,6 +193,14 @@ void cmVisualStudio10TargetGenerator::Generate()
this-WriteString(SccProvider, 2);
[Cmake-commits] CMake branch, next, updated. v2.8.6-1745-ga2d0d66
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 a2d0d66b89a11fa9a7d280d80f5ef58b87c7dfac (commit)
via 467ee368402b73756ac1b662b86cd0eee95bbe07 (commit)
via 4571ea6e4d0ecbf25ac7cfa63715cc931f0f17d0 (commit)
via 9cfc920973b6e479e3ba30e6b89e26ddea4d892f (commit)
from a476a91a749d49c8f75da0ffbc2ee1fd3f882b8c (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=a2d0d66b89a11fa9a7d280d80f5ef58b87c7dfac
commit a2d0d66b89a11fa9a7d280d80f5ef58b87c7dfac
Merge: a476a91 467ee36
Author: David Cole david.c...@kitware.com
AuthorDate: Tue Nov 1 13:56:39 2011 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Nov 1 13:56:39 2011 -0400
Merge topic 'rebase-qt4-deploy-module' into next
467ee36 Check plugin variables are defined before warning.
4571ea6 Don't resolve directories; are never relative.
9cfc920 Match fixup_qt4_executable with documentation.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=467ee368402b73756ac1b662b86cd0eee95bbe07
commit 467ee368402b73756ac1b662b86cd0eee95bbe07
Author: Mike McQuaid m...@mikemcquaid.com
AuthorDate: Fri Oct 28 17:33:21 2011 +0100
Commit: David Cole david.c...@kitware.com
CommitDate: Tue Nov 1 13:54:35 2011 -0400
Check plugin variables are defined before warning.
diff --git a/Modules/DeployQt4.cmake b/Modules/DeployQt4.cmake
index ef8dd1f..4bf1b6c 100644
--- a/Modules/DeployQt4.cmake
+++ b/Modules/DeployQt4.cmake
@@ -225,9 +225,11 @@ function(install_qt4_plugin plugin executable copy
installed_plugin_path_var)
else()
string(TOUPPER QT_${plugin}_PLUGIN plugin_var)
endif()
-set(plugin_release ${${plugin_var}_RELEASE})
-set(plugin_debug ${${plugin_var}_DEBUG})
-if(NOT EXISTS ${plugin_release} AND NOT EXISTS
${plugin_debug})
+set(plugin_release_var ${plugin_var}_RELEASE)
+set(plugin_debug_var ${plugin_var}_DEBUG)
+set(plugin_release ${${plugin_release_var}})
+set(plugin_debug ${${plugin_debug_var}})
+if(DEFINED ${plugin_release_var} AND DEFINED
${plugin_debug_var} AND NOT EXISTS ${plugin_release} AND NOT EXISTS
${plugin_debug})
message(WARNING Qt plugin \${plugin}\ not
recognized or found.)
endif()
install_qt4_plugin_path(${plugin_release} ${executable}
${copy} ${installed_plugin_path_var} ${plugins_dir} ${component}
Release|RelWithDebInfo|MinSizeRel)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4571ea6e4d0ecbf25ac7cfa63715cc931f0f17d0
commit 4571ea6e4d0ecbf25ac7cfa63715cc931f0f17d0
Author: Mike McQuaid m...@mikemcquaid.com
AuthorDate: Fri Oct 28 17:32:28 2011 +0100
Commit: David Cole david.c...@kitware.com
CommitDate: Tue Nov 1 13:54:34 2011 -0400
Don't resolve directories; are never relative.
diff --git a/Modules/DeployQt4.cmake b/Modules/DeployQt4.cmake
index 3e20d34..ef8dd1f 100644
--- a/Modules/DeployQt4.cmake
+++ b/Modules/DeployQt4.cmake
@@ -151,7 +151,6 @@ function(fixup_qt4_executable executable)
endforeach()
resolve_qt4_paths(libs ${executable_path})
-resolve_qt4_paths(dirs ${executable_path})
if(write_qt_conf)
set(qt_conf_contents [Paths]\nPlugins = ${plugins_dir})
@@ -265,7 +264,6 @@ function(install_qt4_executable executable)
endforeach()
resolve_qt4_paths(libs)
-resolve_qt4_paths(dirs)
install(CODE
INCLUDE( \${DeployQt4_cmake_dir}/DeployQt4.cmake\ )
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9cfc920973b6e479e3ba30e6b89e26ddea4d892f
commit 9cfc920973b6e479e3ba30e6b89e26ddea4d892f
Author: Mike McQuaid m...@mikemcquaid.com
AuthorDate: Fri Oct 28 17:31:30 2011 +0100
Commit: David Cole david.c...@kitware.com
CommitDate: Tue Nov 1 13:54:34 2011 -0400
Match fixup_qt4_executable with documentation.
diff --git a/Modules/DeployQt4.cmake b/Modules/DeployQt4.cmake
index bdf8360..3e20d34 100644
--- a/Modules/DeployQt4.cmake
+++ b/Modules/DeployQt4.cmake
@@ -56,7 +56,7 @@
# (or plugins_dir) relative to executable and store the result in
# installed_plugin_path_var. See documentation of INSTALL_QT4_PLUGIN_PATH.
#
-# INSTALL_QT4_EXECUTABLE(executable qtplugins [libs dirs
plugins_dir request_qt_conf])
+# INSTALL_QT4_EXECUTABLE(executable [qtplugins libs dirs
plugins_dir request_qt_conf])
# Installs Qt plugins, writes a Qt configuration file (if needed) and fixes up
# a Qt4 executable using
[Cmake-commits] CMake branch, master, updated. v2.8.6-119-g9d87a92
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, master has been updated via 9d87a9251eef7008731fc4182cddccf5916bf541 (commit) via 26b6794fd5e570a4262a2adcf0c3c48d2c19e6e5 (commit) from 13d19468d03bfea1b886c5473e8fcafa09cf2e3a (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=9d87a9251eef7008731fc4182cddccf5916bf541 commit 9d87a9251eef7008731fc4182cddccf5916bf541 Merge: 13d1946 26b6794 Author: David Cole david.c...@kitware.com AuthorDate: Tue Nov 1 14:25:54 2011 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Nov 1 14:25:54 2011 -0400 Merge topic 'ctest-memcheck-log-newline-issue-12538' 26b6794 Source/cmCTest.cxx: Add missing newline (#12538) --- Summary of changes: Source/cmCTest.cxx |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v2.8.6-121-g55eda4a
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, master has been updated via 55eda4a06013fd4d09728a5a96edcc6fc4d1f988 (commit) via fe6d9c1a448c511559967a6f8467c84d75d89e64 (commit) from 9d87a9251eef7008731fc4182cddccf5916bf541 (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=55eda4a06013fd4d09728a5a96edcc6fc4d1f988 commit 55eda4a06013fd4d09728a5a96edcc6fc4d1f988 Merge: 9d87a92 fe6d9c1 Author: David Cole david.c...@kitware.com AuthorDate: Tue Nov 1 14:26:10 2011 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Nov 1 14:26:10 2011 -0400 Merge topic 'FindLibXsltImprovements' fe6d9c1 FindLibXslt: also search libexslt and xsltproc --- Summary of changes: Modules/FindLibXslt.cmake | 23 +++ 1 files changed, 19 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
[Cmake-commits] CMake branch, master, updated. v2.8.6-123-ge0d97b6
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, master has been updated via e0d97b672875ab83e4e30ddd00746860e6e1fd87 (commit) via 499c10457282f44d954c8a7385cbf9f8c82d1b08 (commit) from 55eda4a06013fd4d09728a5a96edcc6fc4d1f988 (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=e0d97b672875ab83e4e30ddd00746860e6e1fd87 commit e0d97b672875ab83e4e30ddd00746860e6e1fd87 Merge: 55eda4a 499c104 Author: David Cole david.c...@kitware.com AuthorDate: Tue Nov 1 14:26:16 2011 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Nov 1 14:26:16 2011 -0400 Merge topic 'fix-12383-clear-ctest-vecs' 499c104 CTest: Clear custom vectors before populating (#12383) --- Summary of changes: Source/cmCTest.cxx |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v2.8.6-125-gc2300e6
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, master has been updated
via c2300e6265400089b8efb5e34e4d33e1425354ac (commit)
via 76ecdd8d169fd256549875b5ed7e7c5c1963 (commit)
from e0d97b672875ab83e4e30ddd00746860e6e1fd87 (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=c2300e6265400089b8efb5e34e4d33e1425354ac
commit c2300e6265400089b8efb5e34e4d33e1425354ac
Merge: e0d97b6 76ecdd8
Author: David Cole david.c...@kitware.com
AuthorDate: Tue Nov 1 14:26:21 2011 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Nov 1 14:26:21 2011 -0400
Merge topic 'fix-12539-ctestconfig-from-build-dir'
76ecdd8 CTest: Look for CTestConfig.cmake in build dir first, then source
dir
---
Summary of changes:
Source/cmCTest.cxx | 32
Tests/CMakeLists.txt | 29 ++
Tests/CTestTestConfigFileInBuildDir/CMakeLists.txt |3 ++
.../CTestConfig.cmake |4 +-
.../test1.cmake.in}| 10 ++
.../test2.cmake.in}| 10 ++
6 files changed, 68 insertions(+), 20 deletions(-)
create mode 100644 Tests/CTestTestConfigFileInBuildDir/CMakeLists.txt
copy Tests/{CTestTestParallel =
CTestTestConfigFileInBuildDir}/CTestConfig.cmake (66%)
copy Tests/{CTestTestCycle/test.cmake.in =
CTestTestConfigFileInBuildDir/test1.cmake.in} (78%)
copy Tests/{CTestTestCycle/test.cmake.in =
CTestTestConfigFileInBuildDir/test2.cmake.in} (78%)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v2.8.6-127-g5531e5e
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, master has been updated via 5531e5e162d448d6f63cea509c2a634b7fea0654 (commit) via 30e4a5204fb067f28ae3bc31955f9b8fbc8a2643 (commit) from c2300e6265400089b8efb5e34e4d33e1425354ac (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=5531e5e162d448d6f63cea509c2a634b7fea0654 commit 5531e5e162d448d6f63cea509c2a634b7fea0654 Merge: c2300e6 30e4a52 Author: David Cole david.c...@kitware.com AuthorDate: Tue Nov 1 14:26:27 2011 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Nov 1 14:26:27 2011 -0400 Merge topic 'doc-link_directories-misconception' 30e4a52 Tell people that link_directories() is not what they are searching for --- Summary of changes: Source/cmLinkDirectoriesCommand.h |7 ++- 1 files changed, 6 insertions(+), 1 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v2.8.6-129-g09dfcfb
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, master has been updated via 09dfcfb6cbc15588c4cc6fcff76a9e2d1559d529 (commit) via e20c59ae5013affa5f80f5f9b76020bdcbd42f4d (commit) from 5531e5e162d448d6f63cea509c2a634b7fea0654 (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=09dfcfb6cbc15588c4cc6fcff76a9e2d1559d529 commit 09dfcfb6cbc15588c4cc6fcff76a9e2d1559d529 Merge: 5531e5e e20c59a Author: David Cole david.c...@kitware.com AuthorDate: Tue Nov 1 14:26:31 2011 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Nov 1 14:26:31 2011 -0400 Merge topic 'CPackRPM-perComponentHeader' e20c59a CPackRPM support component specific variables for spec files --- Summary of changes: Modules/CPackRPM.cmake | 39 +--- .../MyLibCPackConfig-IgnoreGroup.cmake.in |1 + .../MyLibCPackConfig-OnePackPerGroup.cmake.in |1 + 3 files changed, 35 insertions(+), 6 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v2.8.6-131-g55659c4
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, master has been updated via 55659c4ea932851c4d969b83e919c3dacec2505e (commit) via 83b13a250c33bea56eadc7a9cf9f3c55546b (commit) from 09dfcfb6cbc15588c4cc6fcff76a9e2d1559d529 (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=55659c4ea932851c4d969b83e919c3dacec2505e commit 55659c4ea932851c4d969b83e919c3dacec2505e Merge: 09dfcfb 83b13a2 Author: David Cole david.c...@kitware.com AuthorDate: Tue Nov 1 14:26:38 2011 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Nov 1 14:26:38 2011 -0400 Merge topic 'FixCMAKE_BUILD_TOOL_doc' 83b13a2 Fix old reference to CMAKE_MAKE_PROGRAM inside CMAKE_BUILD_TOOL doc. --- Summary of changes: Source/cmDocumentVariables.cxx |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v2.8.6-135-ga39c195
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, master has been updated via a39c195bc56656e86b4d647f50f987eb955d240b (commit) via 467ee368402b73756ac1b662b86cd0eee95bbe07 (commit) via 4571ea6e4d0ecbf25ac7cfa63715cc931f0f17d0 (commit) via 9cfc920973b6e479e3ba30e6b89e26ddea4d892f (commit) from 55659c4ea932851c4d969b83e919c3dacec2505e (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=a39c195bc56656e86b4d647f50f987eb955d240b commit a39c195bc56656e86b4d647f50f987eb955d240b Merge: 55659c4 467ee36 Author: David Cole david.c...@kitware.com AuthorDate: Tue Nov 1 14:26:43 2011 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Nov 1 14:26:43 2011 -0400 Merge topic 'qt4-deploy-module' 467ee36 Check plugin variables are defined before warning. 4571ea6 Don't resolve directories; are never relative. 9cfc920 Match fixup_qt4_executable with documentation. --- Summary of changes: Modules/DeployQt4.cmake | 15 --- 1 files changed, 8 insertions(+), 7 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.6-1754-gd4621bd
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 d4621bdb308056f286a445fd01444b1cf8638119 (commit) via a39c195bc56656e86b4d647f50f987eb955d240b (commit) via 55659c4ea932851c4d969b83e919c3dacec2505e (commit) via 09dfcfb6cbc15588c4cc6fcff76a9e2d1559d529 (commit) via 5531e5e162d448d6f63cea509c2a634b7fea0654 (commit) via c2300e6265400089b8efb5e34e4d33e1425354ac (commit) via e0d97b672875ab83e4e30ddd00746860e6e1fd87 (commit) via 55eda4a06013fd4d09728a5a96edcc6fc4d1f988 (commit) via 9d87a9251eef7008731fc4182cddccf5916bf541 (commit) from a2d0d66b89a11fa9a7d280d80f5ef58b87c7dfac (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=d4621bdb308056f286a445fd01444b1cf8638119 commit d4621bdb308056f286a445fd01444b1cf8638119 Merge: a2d0d66 a39c195 Author: David Cole david.c...@kitware.com AuthorDate: Tue Nov 1 14:27:02 2011 -0400 Commit: David Cole david.c...@kitware.com CommitDate: Tue Nov 1 14:27:02 2011 -0400 Merge branch 'master' into next --- Summary of changes: hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.6-1757-gb447c1d
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 b447c1d1dbdd3b6adebae779eedf0ca4fbde329b (commit) via 2c648ab7e204540a8a669b597cc7d3510c84647e (commit) via 52719a1d66db0bbdb17019bcb2ea5ab0a1258e22 (commit) from d4621bdb308056f286a445fd01444b1cf8638119 (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=b447c1d1dbdd3b6adebae779eedf0ca4fbde329b commit b447c1d1dbdd3b6adebae779eedf0ca4fbde329b Merge: d4621bd 2c648ab Author: Alexander Neundorf neund...@kde.org AuthorDate: Tue Nov 1 14:57:04 2011 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Nov 1 14:57:04 2011 -0400 Merge topic 'AddMocOptionsToAutomoc' into next 2c648ab add documentation for the AUTOMOC_MOC_OPTIONS property 52719a1 automoc: fix #12541, support moc options http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2c648ab7e204540a8a669b597cc7d3510c84647e commit 2c648ab7e204540a8a669b597cc7d3510c84647e Author: Alex Neundorf neund...@kde.org AuthorDate: Tue Nov 1 19:54:04 2011 +0100 Commit: Alex Neundorf neund...@kde.org CommitDate: Tue Nov 1 19:54:04 2011 +0100 add documentation for the AUTOMOC_MOC_OPTIONS property Alex diff --git a/Source/cmDocumentVariables.cxx b/Source/cmDocumentVariables.cxx index f4d4e7c..a759a82 100644 --- a/Source/cmDocumentVariables.cxx +++ b/Source/cmDocumentVariables.cxx @@ -1103,6 +1103,15 @@ void cmDocumentVariables::DefineVariables(cmake* cm) Variables that Control the Build); cm-DefineProperty +(CMAKE_AUTOMOC_MOC_OPTIONS, cmProperty::VARIABLE, + Additional options for moc when using automoc (see CMAKE_AUTOMOC)., + This variable is used to initialize the + AUTOMOC_MOC_OPTIONS property on all the targets. + See that target property for additional information., + false, + Variables that Control the Build); + + cm-DefineProperty (CMAKE_DEBUG_POSTFIX, cmProperty::VARIABLE, See variable CMAKE_CONFIG_POSTFIX., This variable is a special case of the more-general diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index e8064d0..d669a5b 100644 --- a/Source/cmTarget.cxx +++ b/Source/cmTarget.cxx @@ -157,7 +157,20 @@ 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 + Additional command line options for moc can be set via the + AUTOMOC_MOC_OPTIONS property. +); + + 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, http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=52719a1d66db0bbdb17019bcb2ea5ab0a1258e22 commit 52719a1d66db0bbdb17019bcb2ea5ab0a1258e22 Author: Alex Neundorf neund...@kde.org AuthorDate: Tue Nov 1 14:33:11 2011 +0100 Commit: Alex Neundorf neund...@kde.org CommitDate: Tue Nov 1 14:33:11 2011 +0100 automoc: fix #12541, support moc options This commit adds a new target property AUTOMOC_MOC_OPTIONS, which can be set to add extra options for the moc invocations done via automoc. This is equivalent to the OPTIONS parameter in the qt4_wrap_cpp() macro. Alex diff --git a/Modules/AutomocInfo.cmake.in b/Modules/AutomocInfo.cmake.in index 2dc3aa2..9c71952 100644 --- a/Modules/AutomocInfo.cmake.in +++ b/Modules/AutomocInfo.cmake.in @@ -3,6 +3,7 @@ set(AM_HEADERS @_moc_headers@ ) set(AM_MOC_COMPILE_DEFINITIONS @_moc_compile_defs@) set(AM_MOC_DEFINITIONS @_moc_defs@) set(AM_MOC_INCLUDES @_moc_incs@) +set(AM_MOC_OPTIONS @_moc_options@) set(AM_CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE @CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE@) set(AM_CMAKE_BINARY_DIR @CMAKE_BINARY_DIR@/) set(AM_CMAKE_SOURCE_DIR @CMAKE_SOURCE_DIR@/) diff --git a/Source/cmQtAutomoc.cxx b/Source/cmQtAutomoc.cxx index e9cc9d1..eb89c90 100644 --- a/Source/cmQtAutomoc.cxx +++ b/Source/cmQtAutomoc.cxx @@ -130,6 +130,8 @@ void cmQtAutomoc::SetupAutomocTarget(cmTarget*
[Cmake-commits] CMake branch, next, updated. v2.8.6-1763-gb46baba
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 b46baba2aab2a9ef0fadfb5268a3c57f09fa5422 (commit)
via 54595e6d89a6280dfbc9580500ce50283ce71d3f (commit)
from 7b3c5866979e2b5c53f9dabafa1dfd330683294b (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=b46baba2aab2a9ef0fadfb5268a3c57f09fa5422
commit b46baba2aab2a9ef0fadfb5268a3c57f09fa5422
Merge: 7b3c586 54595e6
Author: David Cole david.c...@kitware.com
AuthorDate: Tue Nov 1 16:40:44 2011 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Nov 1 16:40:44 2011 -0400
Merge topic 'add-mfc-test' into next
54595e6 Tests: Avoid MFC test automatically for VCExpress builds (#11213)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=54595e6d89a6280dfbc9580500ce50283ce71d3f
commit 54595e6d89a6280dfbc9580500ce50283ce71d3f
Author: David Cole david.c...@kitware.com
AuthorDate: Tue Nov 1 16:27:24 2011 -0400
Commit: David Cole david.c...@kitware.com
CommitDate: Tue Nov 1 16:27:24 2011 -0400
Tests: Avoid MFC test automatically for VCExpress builds (#11213)
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index f400f6d..27018d1 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -1210,6 +1210,30 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P
${CMake_SOURCE_DIR}/Utilities/
set(CTEST_RUN_MFC OFF)
if(MSVC)
set(CTEST_RUN_MFC ON)
+
+ # Look for evidence that this is a VCExpress build. If so, avoid
+ # the MFC test by default.
+ string(TOLOWER ${CMAKE_TEST_MAKEPROGRAM} mkprog)
+ if(mkprog MATCHES vcexpress)
+message(STATUS
+ CMAKE_TEST_MAKEPROGRAM indicates vcexpress, avoiding MFC test)
+set(CTEST_RUN_MFC OFF)
+ endif()
+
+ # Since MSBuild might also be the makeprogram for a VCExpress
+ # build tree, use one more heuristic, too. The string representing
+ # the .vcproj file type contains VCExpress on machines where an
+ # express edition of VS was installed last:
+ if(CTEST_RUN_MFC)
+execute_process(COMMAND cmd /c assoc .vcproj
+ OUTPUT_STRIP_TRAILING_WHITESPACE
+ OUTPUT_VARIABLE ov)
+if(ov MATCHES VCExpress)
+ message(STATUS
+.vcproj file association indicates VCExpress, avoiding MFC test)
+ set(CTEST_RUN_MFC OFF)
+endif()
+ endif()
endif()
endif()
---
Summary of changes:
Tests/CMakeLists.txt | 24
1 files changed, 24 insertions(+), 0 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
