diff options
| author | David Cole <david.cole@kitware.com> | 2012-01-25 16:15:22 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2012-01-25 16:15:22 (GMT) |
| commit | 5737cdbcbd459f4d7c270f5ed95ac698894979fd (patch) | |
| tree | 7dcb007329c1d561ea2a54d3dd806491de1930bc | |
| parent | cef75ca90944a45ced82d9a53a592b3526a408af (diff) | |
| parent | 7240aa7facabc3f0fc03833ec4d956e982469557 (diff) | |
| download | CMake-5737cdbcbd459f4d7c270f5ed95ac698894979fd.zip CMake-5737cdbcbd459f4d7c270f5ed95ac698894979fd.tar.gz CMake-5737cdbcbd459f4d7c270f5ed95ac698894979fd.tar.bz2 | |
Merge topic 'update-dashmacmini2-qt'
7240aa7 Update dashmacmini2 release script to use Qt 4.6.3
| -rw-r--r-- | Utilities/Release/dashmacmini2_release.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Utilities/Release/dashmacmini2_release.cmake b/Utilities/Release/dashmacmini2_release.cmake index 115181d..522ee76 100644 --- a/Utilities/Release/dashmacmini2_release.cmake +++ b/Utilities/Release/dashmacmini2_release.cmake @@ -5,14 +5,14 @@ set(INSTALL_PREFIX /) set(HOST dashmacmini2) set(MAKE_PROGRAM "make") set(MAKE "${MAKE_PROGRAM} -j2") -set(CPACK_BINARY_GENERATORS "PackageMaker TGZ TZ") +set(CPACK_BINARY_GENERATORS "PackageMaker TGZ TZ") set(INITIAL_CACHE " CMAKE_BUILD_TYPE:STRING=Release CMAKE_OSX_ARCHITECTURES:STRING=ppc;i386 CMAKE_SKIP_BOOTSTRAP_TEST:STRING=TRUE CPACK_SYSTEM_NAME:STRING=Darwin-universal BUILD_QtDialog:BOOL=TRUE -QT_QMAKE_EXECUTABLE:FILEPATH=/Users/kitware/Software/QtBinUniversal/bin/qmake +QT_QMAKE_EXECUTABLE:FILEPATH=/Users/kitware/Dashboards/Support/qt-4.6.3/bin/bin/qmake ") get_filename_component(path "${CMAKE_CURRENT_LIST_FILE}" PATH) include(${path}/release_cmake.cmake) |