[Cmake-commits] CMake branch, next, updated. v2.8.5-1361-g622a9fb

[David Cole]

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  622a9fbe6532f5bb4aa101bebacdbad66218c9e0 (commit)
       via  ff5971635170af8754edb029b5345e17fb4de4fa (commit)
      from  85c32c1c158ad05252a441f038c26e9d9b218786 (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=622a9fbe6532f5bb4aa101bebacdbad66218c9e0
commit 622a9fbe6532f5bb4aa101bebacdbad66218c9e0
Merge: 85c32c1 ff59716
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Mon Aug 1 15:35:23 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Aug 1 15:35:23 2011 -0400

    Merge topic 'fix-11866-add-watcom-sys-libs' into next
    
    ff59716 Watcom: Use correct args for execute_process call (#11866)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ff5971635170af8754edb029b5345e17fb4de4fa
commit ff5971635170af8754edb029b5345e17fb4de4fa
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Mon Aug 1 15:29:13 2011 -0400
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Mon Aug 1 15:29:13 2011 -0400

    Watcom: Use correct args for execute_process call (#11866)
    
    I botched an exec_program to execute_process translation on Friday.
    RESULT_VARIABLE is the correct argument to execute_process.

diff --git a/Modules/Platform/Windows-wcl386.cmake b/Modules/Platform/Windows-wcl386.cmake
index c10fd78..3f8d65a 100644
--- a/Modules/Platform/Windows-wcl386.cmake
+++ b/Modules/Platform/Windows-wcl386.cmake
@@ -95,12 +95,12 @@ IF(NOT CMAKE_WATCOM_COMPILER_TESTS_RUN)
   EXECUTE_PROCESS(COMMAND ${CMAKE_TEST_COMPILER}
     -q -pc \"${testWatcomVersionFile}\"
     OUTPUT_VARIABLE CMAKE_COMPILER_OUTPUT
-    RETURN_VALUE CMAKE_COMPILER_RETURN
+    RESULT_VARIABLE CMAKE_COMPILER_RETURN
     )
   STRING(REGEX REPLACE "\n" " " compilerVersion "${CMAKE_COMPILER_OUTPUT}")
   STRING(REGEX REPLACE ".*VERSION=(.*)" "\\1"
     compilerVersion "${compilerVersion}")
-  IF(NOT CMAKE_COMPILER_RETURN)
+  IF("${CMAKE_COMPILER_RETURN}" STREQUAL "0")
     SET(WATCOM16)
     SET(WATCOM17)
     SET(WATCOM18)

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

Summary of changes:
 Modules/Platform/Windows-wcl386.cmake |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake