[Cmake-commits] CMake branch, next, updated. v2.8.12-4024-g12276d9

Brad King brad.king at kitware.com
Wed Oct 16 09:25:57 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  12276d9a867b537eac68a724863a019803b55356 (commit)
       via  7d445d62c5c24de852be749b6f3eeb9e2b8cbeab (commit)
      from  b7fa7f7f82931173aa9c66962b00deed44b5bad8 (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=12276d9a867b537eac68a724863a019803b55356
commit 12276d9a867b537eac68a724863a019803b55356
Merge: b7fa7f7 7d445d6
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 16 09:25:48 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 16 09:25:48 2013 -0400

    Merge topic 'doc-reStructuredText' into next
    
    7d445d6 Tests/CMakeLib: Fix testRST self-location for in-source build


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7d445d62c5c24de852be749b6f3eeb9e2b8cbeab
commit 7d445d62c5c24de852be749b6f3eeb9e2b8cbeab
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 16 08:37:51 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Oct 16 09:21:28 2013 -0400

    Tests/CMakeLib: Fix testRST self-location for in-source build

diff --git a/Tests/CMakeLib/testRST.cxx b/Tests/CMakeLib/testRST.cxx
index 6ae1e79..bad9560 100644
--- a/Tests/CMakeLib/testRST.cxx
+++ b/Tests/CMakeLib/testRST.cxx
@@ -28,6 +28,10 @@ void reportLine(std::ostream& os, bool ret, std::string line, bool eol)
 int testRST(int, char*[])
 {
   std::string dir = cmSystemTools::GetFilenamePath(__FILE__);
+  if(dir.empty())
+    {
+    dir = ".";
+    }
   std::string a_name = "testRST.actual";
   std::string e_name = dir + "/testRST.expect";
 

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

Summary of changes:
 Tests/CMakeLib/testRST.cxx |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list