[Cmake-commits] CMake branch, next, updated. v3.0.0-rc2-1382-gbafcbef

[Stephen Kelly]

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  bafcbef6235c1a375eeb8089d0a371ea9c1e2ea3 (commit)
       via  43d3d6f5dcf6f653fcf950fcf7f993931f012a94 (commit)
      from  4bb42615f11425ba1903e0b0d23d9d70f580a905 (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=bafcbef6235c1a375eeb8089d0a371ea9c1e2ea3
commit bafcbef6235c1a375eeb8089d0a371ea9c1e2ea3
Merge: 4bb4261 43d3d6f
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Mar 21 06:14:32 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Mar 21 06:14:32 2014 -0400

    Merge topic 'fix-Qt4-moc-commands-depends' into next
    
    43d3d6f5 Specify Qt


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=43d3d6f5dcf6f653fcf950fcf7f993931f012a94
commit 43d3d6f5dcf6f653fcf950fcf7f993931f012a94
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Mar 21 11:14:09 2014 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Mar 21 11:14:09 2014 +0100

    Specify Qt

diff --git a/Tests/Qt4Targets/CMakeLists.txt b/Tests/Qt4Targets/CMakeLists.txt
index 012a561..7430084 100644
--- a/Tests/Qt4Targets/CMakeLists.txt
+++ b/Tests/Qt4Targets/CMakeLists.txt
@@ -42,7 +42,7 @@ try_compile(RESULT
   "${CMAKE_CURRENT_BINARY_DIR}/IncrementalMocBuild"
   "${CMAKE_CURRENT_SOURCE_DIR}/IncrementalMoc"
   IncrementalMoc
-  CMAKE_FLAGS -DADD_DEF=0)
+  CMAKE_FLAGS -DADD_DEF=0 "-DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE}")
 file(TIMESTAMP "${CMAKE_CURRENT_BINARY_DIR}/IncrementalMocBuild/moc_foo.cpp" tsvar_before "${timeformat}")
 if (NOT tsvar_before)
   message(SEND_ERROR "Unable to read timestamp from moc file from first build!")
@@ -54,7 +54,7 @@ try_compile(RESULT
   "${CMAKE_CURRENT_BINARY_DIR}/IncrementalMocBuild"
   "${CMAKE_CURRENT_SOURCE_DIR}/IncrementalMoc"
   IncrementalMoc
-  CMAKE_FLAGS -DADD_DEF=1)
+  CMAKE_FLAGS -DADD_DEF=1 "-DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE}")
 file(TIMESTAMP "${CMAKE_CURRENT_BINARY_DIR}/IncrementalMocBuild/moc_foo.cpp" tsvar_after "${timeformat}")
 if (NOT tsvar_after)
   message(SEND_ERROR "Unable to read timestamp from moc file from second build!")

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

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


hooks/post-receive
-- 
CMake