[Cmake-commits] CMake branch, next, updated. v3.3.1-2789-g8dd5a85

[Chuck Atkins]

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  8dd5a85278db6340240f39051f37259255ef3968 (commit)
       via  6a1393e5afdbc3deae5f34b85da5ac683a4630ea (commit)
      from  975e5508025450edfd26f13d93905fcdf8ff266b (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=8dd5a85278db6340240f39051f37259255ef3968
commit 8dd5a85278db6340240f39051f37259255ef3968
Merge: 975e550 6a1393e
Author:     Chuck Atkins <chuck.atkins at kitware.com>
AuthorDate: Tue Sep 8 12:47:33 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Sep 8 12:47:33 2015 -0400

    Merge topic 'restrict-shlib-link-flags-to-enable-exports' into next
    
    6a1393e5 CMP0065: Add more debug information to the CMP0065 tests


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6a1393e5afdbc3deae5f34b85da5ac683a4630ea
commit 6a1393e5afdbc3deae5f34b85da5ac683a4630ea
Author:     Chuck Atkins <chuck.atkins at kitware.com>
AuthorDate: Tue Sep 8 12:45:23 2015 -0400
Commit:     Chuck Atkins <chuck.atkins at kitware.com>
CommitDate: Tue Sep 8 12:45:23 2015 -0400

    CMP0065: Add more debug information to the CMP0065 tests

diff --git a/Tests/RunCMake/CMP0065/BuildTargetInSubProject.cmake b/Tests/RunCMake/CMP0065/BuildTargetInSubProject.cmake
index 5cd829a..9339e46 100644
--- a/Tests/RunCMake/CMP0065/BuildTargetInSubProject.cmake
+++ b/Tests/RunCMake/CMP0065/BuildTargetInSubProject.cmake
@@ -1,15 +1,15 @@
 function(BuildTargetInSubProject P T E)
-  try_compile(OUTVAR
+  try_compile(RESULTVAR
     ${CMAKE_CURRENT_BINARY_DIR}/subproject
     ${CMAKE_CURRENT_SOURCE_DIR}/subproject
-    ${P} ${T})
-  if(E AND OUTVAR)
+    ${P} ${T} OUTPUT_VARIABLE O)
+  if(E AND RESULTVAR)
     message(STATUS "${P} target ${T} succeeded as expected")
-  elseif(E AND NOT OUTVAR)
-    message(FATAL_ERROR "${P} target ${T} failed but should have succeeded")
-  elseif(NOT E AND NOT OUTVAR)
+  elseif(E AND NOT RESULTVAR)
+    message(FATAL_ERROR "${P} target ${T} failed but should have succeeded.  Output:${O}")
+  elseif(NOT E AND NOT RESULTVAR)
     message(STATUS "${P} target ${T} failed as expected")
-  elseif(NOT E AND OUTVAR)
-    message(FATAL_ERROR "${P} target ${T} succeeded but should have failed")
+  elseif(NOT E AND RESULTVAR)
+    message(FATAL_ERROR "${P} target ${T} succeeded but should have failed.  Output:${O}")
   endif()
 endfunction()

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

Summary of changes:
 Tests/RunCMake/CMP0065/BuildTargetInSubProject.cmake |   16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
CMake