[Cmake-commits] CMake branch, next, updated. v3.1.1-2278-ga80a6fc

[Matt McCormick]

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  a80a6fc857c5f77840c27caa89b499e22518f68d (commit)
       via  fe6b4fad790428480b0b7f69b77da12ec795af8d (commit)
      from  e00d75e25aaa93c38b59df54163ba468adac1c8a (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=a80a6fc857c5f77840c27caa89b499e22518f68d
commit a80a6fc857c5f77840c27caa89b499e22518f68d
Merge: e00d75e fe6b4fa
Author:     Matt McCormick <matt.mccormick at kitware.com>
AuthorDate: Fri Jan 23 10:40:18 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jan 23 10:40:18 2015 -0500

    Merge topic 'try-run-link-libraries' into next
    
    fe6b4fad try_run: Do not expect ImportExport runs to succeed.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fe6b4fad790428480b0b7f69b77da12ec795af8d
commit fe6b4fad790428480b0b7f69b77da12ec795af8d
Author:     Matt McCormick <matt.mccormick at kitware.com>
AuthorDate: Fri Jan 23 10:39:27 2015 -0500
Commit:     Matt McCormick <matt.mccormick at kitware.com>
CommitDate: Fri Jan 23 10:39:27 2015 -0500

    try_run: Do not expect ImportExport runs to succeed.
    
    Some exotic systems have trouble finding the mock system library at execute
    time.

diff --git a/Tests/ExportImport/Import/A/CMakeLists.txt b/Tests/ExportImport/Import/A/CMakeLists.txt
index d64e917..358776b 100644
--- a/Tests/ExportImport/Import/A/CMakeLists.txt
+++ b/Tests/ExportImport/Import/A/CMakeLists.txt
@@ -321,8 +321,8 @@ if (((CMAKE_C_COMPILER_ID STREQUAL GNU AND CMAKE_C_COMPILER_VERSION VERSION_GREA
         LINK_LIBRARIES exp_systemlib
         OUTPUT_VARIABLE OUTPUT
         )
-      if(NOT EXP_COMPILE_VAR OR NOT EXP_RUN_VAR EQUAL 0)
-        message(SEND_ERROR "try_run failed, but it was expected to succeed ${OUTPUT}.")
+      if(NOT EXP_COMPILE_VAR)
+        message(SEND_ERROR "try_run compile failed, but it was expected to succeed ${OUTPUT}.")
       endif()
     endif()
 
@@ -352,8 +352,8 @@ if (((CMAKE_C_COMPILER_ID STREQUAL GNU AND CMAKE_C_COMPILER_VERSION VERSION_GREA
         LINK_LIBRARIES bld_systemlib
         OUTPUT_VARIABLE OUTPUT
         )
-      if(NOT BLD_COMPILE_VAR OR NOT BLD_RUN_VAR EQUAL 0)
-        message(SEND_ERROR "try_run failed, but it was expected to succeed ${OUTPUT}.")
+      if(NOT BLD_COMPILE_VAR)
+        message(SEND_ERROR "try_run compile failed, but it was expected to succeed ${OUTPUT}.")
       endif()
     endif()
   endif()

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

Summary of changes:
 Tests/ExportImport/Import/A/CMakeLists.txt |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake