[Cmake-commits] CMake branch, next, updated. v2.8.2-1140-gad781ed

[Clinton Stimpson]

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  ad781ed7d63a71e4f3e7eb35ed6e1d86314a9571 (commit)
       via  0476715b87e27c8234bc6c3ac9020cb09ac8be1b (commit)
      from  c661741aad274d6e10f227c61a73400a865815f9 (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=ad781ed7d63a71e4f3e7eb35ed6e1d86314a9571
commit ad781ed7d63a71e4f3e7eb35ed6e1d86314a9571
Merge: c661741 0476715
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Mon Nov 1 09:41:29 2010 -0600
Commit:     Clinton Stimpson <clinton at elemtech.com>
CommitDate: Mon Nov 1 09:41:29 2010 -0600

    Merge branch 'cmake-gui-args-11388' into next


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0476715b87e27c8234bc6c3ac9020cb09ac8be1b
commit 0476715b87e27c8234bc6c3ac9020cb09ac8be1b
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Mon Nov 1 09:40:25 2010 -0600
Commit:     Clinton Stimpson <clinton at elemtech.com>
CommitDate: Mon Nov 1 09:40:25 2010 -0600

    Fix regression to allow specifying a CMakeCache.txt file on the command line.

diff --git a/Source/QtDialog/CMakeSetup.cxx b/Source/QtDialog/CMakeSetup.cxx
index 28f4697..7ba7f51 100644
--- a/Source/QtDialog/CMakeSetup.cxx
+++ b/Source/QtDialog/CMakeSetup.cxx
@@ -165,13 +165,25 @@ int main(int argc, char** argv)
     if(args.count() == 2)
       {
       cmsys_stl::string filePath = cmSystemTools::CollapseFullPath(args[1].toAscii().data());
+
+      // check if argument is a directory containing CMakeCache.txt
       cmsys_stl::string buildFilePath =
         cmSystemTools::CollapseFullPath("CMakeCache.txt", filePath.c_str());
+
+      // check if argument is a CMakeCache.txt file
+      if(cmSystemTools::GetFilenameName(filePath) == "CMakeCache.txt" &&
+         cmSystemTools::FileExists(filePath.c_str()))
+        {
+        buildFilePath = filePath;
+        }
+
+      // check if argument is a directory containing CMakeLists.txt
       cmsys_stl::string srcFilePath =
         cmSystemTools::CollapseFullPath("CMakeLists.txt", filePath.c_str());
+
       if(cmSystemTools::FileExists(buildFilePath.c_str()))
         {
-        dialog.setBinaryDirectory(filePath.c_str());
+        dialog.setBinaryDirectory(cmSystemTools::GetFilenamePath(buildFilePath).c_str());
         }
       else if(cmSystemTools::FileExists(srcFilePath.c_str()))
         {

-----------------------------------------------------------------------

Summary of changes:
 Source/QtDialog/CMakeSetup.cxx |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake