[Cmake-commits] CMake branch, next, updated. v2.8.7-2550-gd7510a4
Bill Hoffman
bill.hoffman at kitware.com
Thu Feb 9 20:36:09 EST 2012
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 d7510a4a4f698fdbe1c951c65ce2392e934bb3ff (commit)
via 9fb9416f78a83c59e1260ec1ec0699618be1b95f (commit)
from 3d606bbc5c28a54642cb57e2b2947c0483cf0335 (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=d7510a4a4f698fdbe1c951c65ce2392e934bb3ff
commit d7510a4a4f698fdbe1c951c65ce2392e934bb3ff
Merge: 3d606bb 9fb9416
Author: Bill Hoffman <bill.hoffman at kitware.com>
AuthorDate: Thu Feb 9 20:36:06 2012 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Feb 9 20:36:06 2012 -0500
Merge topic 'change_qmake_path' into next
9fb9416 Use upgraded qt on linux build machine.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9fb9416f78a83c59e1260ec1ec0699618be1b95f
commit 9fb9416f78a83c59e1260ec1ec0699618be1b95f
Author: Bill Hoffman <bill.hoffman at kitware.com>
AuthorDate: Thu Feb 9 20:33:58 2012 -0500
Commit: Bill Hoffman <bill.hoffman at kitware.com>
CommitDate: Thu Feb 9 20:33:58 2012 -0500
Use upgraded qt on linux build machine.
diff --git a/Utilities/Release/magrathea_release.cmake b/Utilities/Release/magrathea_release.cmake
index 549460e..1b2ae02 100644
--- a/Utilities/Release/magrathea_release.cmake
+++ b/Utilities/Release/magrathea_release.cmake
@@ -10,7 +10,7 @@ CURSES_INCLUDE_PATH:PATH=/usr/i686-gcc-332s/include/ncurses
FORM_LIBRARY:FILEPATH=/usr/i686-gcc-332s/lib/libform.a
CPACK_SYSTEM_NAME:STRING=Linux-i386
BUILD_QtDialog:BOOL:=TRUE
-QT_QMAKE_EXECUTABLE:FILEPATH=/home/kitware/qt-x11-opensource-src-4.3.3-install/bin/qmake
+QT_QMAKE_EXECUTABLE:FILEPATH=/home/kitware/qt-4.43-install/bin/qmake
")
get_filename_component(path "${CMAKE_CURRENT_LIST_FILE}" PATH)
include(${path}/release_cmake.cmake)
-----------------------------------------------------------------------
Summary of changes:
Utilities/Release/magrathea_release.cmake | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list