[Cmake-commits] CMake branch, next, updated. v2.8.5-1660-g743d11b
David Cole
david.cole at kitware.com
Fri Aug 19 12:35:15 EDT 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 743d11b885d92631f0b6ae0f033cc9d1d0941353 (commit)
via b00463f06c80529f02c489872458345790f6cd48 (commit)
via e78ce44b3598807bd401494d484601d9f43bd8b4 (commit)
via 71165e943edb3ba80a0533a640ff6abffb4bcf64 (commit)
from 64e5935c1331f6764364fcc6f55c8f1fb9e0244e (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=743d11b885d92631f0b6ae0f033cc9d1d0941353
commit 743d11b885d92631f0b6ae0f033cc9d1d0941353
Merge: 64e5935 b00463f
Author: David Cole <david.cole at kitware.com>
AuthorDate: Fri Aug 19 12:34:58 2011 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Aug 19 12:34:58 2011 -0400
Merge topic 'AutomocForQt' into next
b00463f QtAutomoc test: Pass QT_QMAKE_EXECUTABLE
e78ce44 Fix automoc with VS builds: apply patch from Bill
71165e9 Silence warning in automoc: use long instead of int
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b00463f06c80529f02c489872458345790f6cd48
commit b00463f06c80529f02c489872458345790f6cd48
Author: David Cole <david.cole at kitware.com>
AuthorDate: Fri Aug 19 12:30:36 2011 -0400
Commit: David Cole <david.cole at kitware.com>
CommitDate: Fri Aug 19 12:31:38 2011 -0400
QtAutomoc test: Pass QT_QMAKE_EXECUTABLE
...in case qmake is not in the PATH
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index b1db40d..9d8a091 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -872,6 +872,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
--build-makeprogram ${CMAKE_TEST_MAKEPROGRAM}
--build-exe-dir "${CMake_BINARY_DIR}/Tests/QtAutomoc"
--force-new-ctest-process
+ --build-options -DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE}
--test-command ${CMAKE_CTEST_COMMAND} -V
)
LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/QtAutomoc")
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e78ce44b3598807bd401494d484601d9f43bd8b4
commit e78ce44b3598807bd401494d484601d9f43bd8b4
Author: Alex Neundorf <neundorf at kde.org>
AuthorDate: Thu Aug 18 19:35:41 2011 +0200
Commit: Alex Neundorf <neundorf at kde.org>
CommitDate: Thu Aug 18 19:35:41 2011 +0200
Fix automoc with VS builds: apply patch from Bill
This patch moves the creation of VS GUIDs from the final pass
to AddHelperCommands() and should fix the failing automoc tests
with VS.
Alex
diff --git a/Source/cmGlobalVisualStudio7Generator.cxx b/Source/cmGlobalVisualStudio7Generator.cxx
index 51b8918..84e7f1b 100644
--- a/Source/cmGlobalVisualStudio7Generator.cxx
+++ b/Source/cmGlobalVisualStudio7Generator.cxx
@@ -739,18 +739,6 @@ void cmGlobalVisualStudio7Generator
entry.Full = "";
}
-// make sure "special" targets have GUID's
-void cmGlobalVisualStudio7Generator::Configure()
-{
- cmGlobalGenerator::Configure();
- this->CreateGUID("ALL_BUILD");
- this->CreateGUID("INSTALL");
- this->CreateGUID("RUN_TESTS");
- this->CreateGUID("EDIT_CACHE");
- this->CreateGUID("REBUILD_CACHE");
- this->CreateGUID("PACKAGE");
-}
-
//----------------------------------------------------------------------------
void
cmGlobalVisualStudio7Generator
diff --git a/Source/cmGlobalVisualStudio7Generator.h b/Source/cmGlobalVisualStudio7Generator.h
index b6c84e8..7f19d83 100644
--- a/Source/cmGlobalVisualStudio7Generator.h
+++ b/Source/cmGlobalVisualStudio7Generator.h
@@ -80,9 +80,6 @@ public:
void CreateGUID(const char* name);
std::string GetGUID(const char* name);
- ///! do configure step
- virtual void Configure();
-
/** Append the subdirectory for the given configuration. */
virtual void AppendDirectoryForConfig(const char* prefix,
const char* config,
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index 3e76f59..372e644 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -68,6 +68,27 @@ void cmLocalVisualStudio7Generator::AddHelperCommands()
lang.insert("DEF");
lang.insert("Fortran");
this->CreateCustomTargetsAndCommands(lang);
+
+ // Now create GUIDs for targets
+ cmTargets &tgts = this->Makefile->GetTargets();
+
+ cmGlobalVisualStudio7Generator* gg =
+ static_cast<cmGlobalVisualStudio7Generator *>(this->GlobalGenerator);
+ for(cmTargets::iterator l = tgts.begin(); l != tgts.end(); l++)
+ {
+ const char* path = l->second.GetProperty("EXTERNAL_MSPROJECT");
+ if(path)
+ {
+ this->ReadAndStoreExternalGUID(
+ l->second.GetName(), path);
+ }
+ else
+ {
+ gg->CreateGUID(l->first.c_str());
+ }
+ }
+
+
this->FixGlobalTargets();
}
@@ -2021,29 +2042,6 @@ void cmLocalVisualStudio7Generator::ReadAndStoreExternalGUID(
}
-void cmLocalVisualStudio7Generator::ConfigureFinalPass()
-{
- cmLocalGenerator::ConfigureFinalPass();
- cmTargets &tgts = this->Makefile->GetTargets();
-
- cmGlobalVisualStudio7Generator* gg =
- static_cast<cmGlobalVisualStudio7Generator *>(this->GlobalGenerator);
- for(cmTargets::iterator l = tgts.begin(); l != tgts.end(); l++)
- {
- const char* path = l->second.GetProperty("EXTERNAL_MSPROJECT");
- if(path)
- {
- this->ReadAndStoreExternalGUID(
- l->second.GetName(), path);
- }
- else
- {
- gg->CreateGUID(l->first.c_str());
- }
- }
-
-}
-
//----------------------------------------------------------------------------
std::string cmLocalVisualStudio7Generator
::GetTargetDirectory(cmTarget const& target) const
diff --git a/Source/cmLocalVisualStudio7Generator.h b/Source/cmLocalVisualStudio7Generator.h
index 4fdbc58..d1b5b00 100644
--- a/Source/cmLocalVisualStudio7Generator.h
+++ b/Source/cmLocalVisualStudio7Generator.h
@@ -57,7 +57,6 @@ public:
void SetVersion8() {this->Version = 8;}
void SetVersion9() {this->Version = 9;}
void SetPlatformName(const char* n) { this->PlatformName = n;}
- virtual void ConfigureFinalPass();
void GetTargetObjectFileDirectories(cmTarget* target,
std::vector<std::string>&
dirs);
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=71165e943edb3ba80a0533a640ff6abffb4bcf64
commit 71165e943edb3ba80a0533a640ff6abffb4bcf64
Author: Alex Neundorf <neundorf at kde.org>
AuthorDate: Thu Aug 18 19:34:49 2011 +0200
Commit: Alex Neundorf <neundorf at kde.org>
CommitDate: Thu Aug 18 19:34:49 2011 +0200
Silence warning in automoc: use long instead of int
Alex
diff --git a/Source/cmQtAutomoc.cxx b/Source/cmQtAutomoc.cxx
index 7dd450e..e5dc3df 100644
--- a/Source/cmQtAutomoc.cxx
+++ b/Source/cmQtAutomoc.cxx
@@ -519,7 +519,7 @@ void cmQtAutomoc::ParseCppFile(const std::string& absFilename,
const std::string absPath = cmsys::SystemTools::GetFilenamePath(
cmsys::SystemTools::GetRealPath(absFilename.c_str())) + '/';
- int matchOffset = 0;
+ long matchOffset = 0;
if (!mocIncludeRegExp.find(contentsString.c_str()))
{
// no moc #include, look whether we need to create a moc from
-----------------------------------------------------------------------
Summary of changes:
Source/cmGlobalVisualStudio7Generator.cxx | 12 --------
Source/cmGlobalVisualStudio7Generator.h | 3 --
Source/cmLocalVisualStudio7Generator.cxx | 44 ++++++++++++++---------------
Source/cmLocalVisualStudio7Generator.h | 1 -
Source/cmQtAutomoc.cxx | 2 +-
Tests/CMakeLists.txt | 1 +
6 files changed, 23 insertions(+), 40 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list