summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Hoffman <bill.hoffman@kitware.com>2009-03-28 14:23:59 (GMT)
committerBill Hoffman <bill.hoffman@kitware.com>2009-03-28 14:23:59 (GMT)
commit7025f91f93cdb9ab2b8ced2b5e6c9a87df6b569f (patch)
tree53fbaf753900ff32e36f13fff6e79264912fbe23
parent7e8ad26e5acac888d2505b7deb98da7d7cb6ea16 (diff)
downloadCMake-7025f91f93cdb9ab2b8ced2b5e6c9a87df6b569f.zip
CMake-7025f91f93cdb9ab2b8ced2b5e6c9a87df6b569f.tar.gz
CMake-7025f91f93cdb9ab2b8ced2b5e6c9a87df6b569f.tar.bz2
ENH: change qt to 4.5
-rw-r--r--Utilities/Release/vogon_release.cmake2
-rw-r--r--Utilities/Release/vogon_release_qt.cmake3
2 files changed, 3 insertions, 2 deletions
diff --git a/Utilities/Release/vogon_release.cmake b/Utilities/Release/vogon_release.cmake
index cd513d0..a458f01 100644
--- a/Utilities/Release/vogon_release.cmake
+++ b/Utilities/Release/vogon_release.cmake
@@ -11,7 +11,7 @@ CMAKE_SKIP_BOOTSTRAP_TEST:STRING=TRUE
CMAKE_GENERATOR:INTERNAL=NMake Makefiles
CMAKE_MT_EXECUTABLE:STRING=mt
BUILD_QtDialog:BOOL:=TRUE
-QT_QMAKE_EXECUTABLE:FILEPATH=c:/qt-win-commercial-src-4.3.3/bin/qmake.exe
+QT_QMAKE_EXECUTABLE:FILEPATH=C:/QT/qt-win-opensource-src-4.5.0/bin/qmake.exe
")
get_filename_component(path "${CMAKE_CURRENT_LIST_FILE}" PATH)
include(${path}/release_cmake.cmake)
diff --git a/Utilities/Release/vogon_release_qt.cmake b/Utilities/Release/vogon_release_qt.cmake
index e14a261..1772006 100644
--- a/Utilities/Release/vogon_release_qt.cmake
+++ b/Utilities/Release/vogon_release_qt.cmake
@@ -1,6 +1,6 @@
set(CMAKE_RELEASE_DIRECTORY "c:/hoffman/CMakeReleaseDirectory")
set(CONFIGURE_WITH_CMAKE TRUE)
-set(CMAKE_CONFIGURE_PATH "c:/Hoffman/My\\ Builds/CMakeVSNMake71Dev/bin/cmake.exe")
+set(CMAKE_CONFIGURE_PATH "c:/Program\\ Files/CMake\\ 2.6/bin/cmake.exe")
set(PROCESSORS 1)
set(HOST vogon)
set(CPACK_BINARY_GENERATORS "NSIS ZIP")
@@ -10,6 +10,7 @@ set(INITIAL_CACHE "CMAKE_BUILD_TYPE:STRING=Release
CMAKE_SKIP_BOOTSTRAP_TEST:STRING=TRUE
CMAKE_GENERATOR:INTERNAL=NMake Makefiles
CMAKE_MT_EXECUTABLE:STRING=mt
+QT_QMAKE_EXECUTABLE:FILEPATH=C:/QT/qt-win-opensource-src-4.5.0/bin/qmake.exe
")
get_filename_component(path "${CMAKE_CURRENT_LIST_FILE}" PATH)
include(${path}/release_cmake.cmake)