[Cmake-commits] CMake branch, next, updated. v3.0.0-rc4-2653-ge275027

[Brad King]

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  e27502756f8dadb524c0198c7ab5ac27355fcf75 (commit)
       via  1dda0f4778e77ea9a78502f83691273901b0ce0f (commit)
      from  69b5d0f0b61912a4641ab95d130df790e33dd75b (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=e27502756f8dadb524c0198c7ab5ac27355fcf75
commit e27502756f8dadb524c0198c7ab5ac27355fcf75
Merge: 69b5d0f 1dda0f4
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu May 1 08:56:14 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu May 1 08:56:14 2014 -0400

    Merge topic 'dont-rewrite-moc-parameter-file' into next
    
    1dda0f47 Tests: Fix Qt4Targets test inner project name


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1dda0f4778e77ea9a78502f83691273901b0ce0f
commit 1dda0f4778e77ea9a78502f83691273901b0ce0f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu May 1 08:54:29 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu May 1 08:54:29 2014 -0400

    Tests: Fix Qt4Targets test inner project name
    
    The try_compile command third argument must be the value given to
    the project() command in the IncrmentalMoc/CMakeLists.txt file.
    While at it, extend the error message to include the try_compile
    output to make debugging easier.

diff --git a/Tests/Qt4Targets/CMakeLists.txt b/Tests/Qt4Targets/CMakeLists.txt
index 3670746..ae0a02b 100644
--- a/Tests/Qt4Targets/CMakeLists.txt
+++ b/Tests/Qt4Targets/CMakeLists.txt
@@ -42,11 +42,16 @@ macro(test_incremental def)
   try_compile(RESULT
     "${CMAKE_CURRENT_BINARY_DIR}/IncrementalMocBuild_${def}"
     "${CMAKE_CURRENT_SOURCE_DIR}/IncrementalMoc"
-    IncrementalMoc_${def}
-    CMAKE_FLAGS -D${def}=0 "-DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE}")
+    IncrementalMoc
+    CMAKE_FLAGS -D${def}=0 "-DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE}"
+    OUTPUT_VARIABLE output
+    )
   file(TIMESTAMP "${CMAKE_CURRENT_BINARY_DIR}/IncrementalMocBuild_${def}/moc_foo.cpp" tsvar_before "${timeformat}")
   if (NOT tsvar_before)
-    message(SEND_ERROR "Unable to read timestamp from moc file from first build with -D${def}!")
+    message(SEND_ERROR
+      "Unable to read timestamp from moc file from first build with -D${def}!\n"
+      "try_compile output:\n${output}"
+      )
   endif()
 
   execute_process(COMMAND "${CMAKE_COMMAND}" -E sleep 2) # Ensure that the timestamp will change.
@@ -54,11 +59,16 @@ macro(test_incremental def)
   try_compile(RESULT
     "${CMAKE_CURRENT_BINARY_DIR}/IncrementalMocBuild_${def}"
     "${CMAKE_CURRENT_SOURCE_DIR}/IncrementalMoc"
-    IncrementalMoc_${def}
-    CMAKE_FLAGS -D${def}=1 "-DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE}")
+    IncrementalMoc
+    CMAKE_FLAGS -D${def}=1 "-DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE}"
+    OUTPUT_VARIABLE output
+    )
   file(TIMESTAMP "${CMAKE_CURRENT_BINARY_DIR}/IncrementalMocBuild_${def}/moc_foo.cpp" tsvar_after "${timeformat}")
   if (NOT tsvar_after)
-    message(SEND_ERROR "Unable to read timestamp from moc file from second build!")
+    message(SEND_ERROR
+      "Unable to read timestamp from moc file from second build!\n"
+      "try_compile output:\n${output}"
+      )
   endif()
 
   if (NOT tsvar_after GREATER tsvar_before)

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

Summary of changes:
 Tests/Qt4Targets/CMakeLists.txt |   22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
CMake