[Cmake-commits] CMake branch, next, updated. v3.0.0-rc1-503-gd851b26

[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  d851b266b2996058ae7c4da6eec3e0a7c7d86acd (commit)
       via  5a2fbb605f2d6b26508afeae8df93caf3bf73ebc (commit)
      from  5926b000386466034dc84430d1801c7154a8d4a2 (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=d851b266b2996058ae7c4da6eec3e0a7c7d86acd
commit d851b266b2996058ae7c4da6eec3e0a7c7d86acd
Merge: 5926b00 5a2fbb6
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Mar 5 02:37:34 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Mar 5 02:37:34 2014 -0500

    Merge topic 'fix-Qt4-moc-command-depends' into next
    
    5a2fbb60 Make sure the correct Qt4 is used.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5a2fbb605f2d6b26508afeae8df93caf3bf73ebc
commit 5a2fbb605f2d6b26508afeae8df93caf3bf73ebc
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Mar 5 08:34:32 2014 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Mar 5 08:34:32 2014 +0100

    Make sure the correct Qt4 is used.

diff --git a/Tests/Qt4Targets/CMakeLists.txt b/Tests/Qt4Targets/CMakeLists.txt
index 0128118..60954a2 100644
--- a/Tests/Qt4Targets/CMakeLists.txt
+++ b/Tests/Qt4Targets/CMakeLists.txt
@@ -39,7 +39,7 @@ target_link_libraries(Qt4WrapMacroTest Qt4::QtGui)
 
 set(timeformat "%Y%j%H%M%S")
 file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/IncrementalMocBuild")
-execute_process(COMMAND "${CMAKE_COMMAND}" -DADD_DEF=0 "-H${CMAKE_CURRENT_SOURCE_DIR}/IncrementalMoc" "-B${CMAKE_CURRENT_BINARY_DIR}/IncrementalMocBuild")
+execute_process(COMMAND "${CMAKE_COMMAND}" -DADD_DEF=0 "-H${CMAKE_CURRENT_SOURCE_DIR}/IncrementalMoc" "-B${CMAKE_CURRENT_BINARY_DIR}/IncrementalMocBuild" "-DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE}")
 execute_process(COMMAND "${CMAKE_COMMAND}" --build "${CMAKE_CURRENT_BINARY_DIR}/IncrementalMocBuild")
 file(TIMESTAMP "${CMAKE_CURRENT_BINARY_DIR}/IncrementalMocBuild/moc_foo.cpp" tsvar_before "${timeformat}")
 if (NOT tsvar_before)
@@ -47,7 +47,7 @@ if (NOT tsvar_before)
 endif()
 
 execute_process(COMMAND "${CMAKE_COMMAND}" -E sleep 1) # Ensure that at least a second passes.
-execute_process(COMMAND "${CMAKE_COMMAND}" -DADD_DEF=1 "${CMAKE_CURRENT_BINARY_DIR}/IncrementalMocBuild")
+execute_process(COMMAND "${CMAKE_COMMAND}" -DADD_DEF=1 "${CMAKE_CURRENT_BINARY_DIR}/IncrementalMocBuild" "-DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE}")
 execute_process(COMMAND "${CMAKE_COMMAND}" --build "${CMAKE_CURRENT_BINARY_DIR}/IncrementalMocBuild")
 file(TIMESTAMP "${CMAKE_CURRENT_BINARY_DIR}/IncrementalMocBuild/moc_foo.cpp" tsvar_after "${timeformat}")
 if (NOT tsvar_after)

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

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


hooks/post-receive
-- 
CMake