diff options
| author | Brad King <brad.king@kitware.com> | 2010-06-07 18:29:37 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2010-06-07 18:29:37 (GMT) |
| commit | 9ed98d880266f41eeeffccffb2df5e33c0b92b65 (patch) | |
| tree | 1a49fa141e8827279cfa16df63ad0769c1dc7c29 | |
| parent | d868ec94068603f3a9702d027c3943bad792af19 (diff) | |
| parent | aa4daa528e76494b25e7fd1e5960af7a806c5bdc (diff) | |
| download | CMake-9ed98d880266f41eeeffccffb2df5e33c0b92b65.zip CMake-9ed98d880266f41eeeffccffb2df5e33c0b92b65.tar.gz CMake-9ed98d880266f41eeeffccffb2df5e33c0b92b65.tar.bz2 | |
Merge branch 'update_release_scripts'
| -rw-r--r-- | Tests/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Utilities/Release/dash2win64_release.cmake | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index 330cf9f..25f7ade 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -270,7 +270,7 @@ IF(BUILD_TESTING) FILE(MAKE_DIRECTORY "${_TEST_DIR}") FILE(WRITE "${_TEST_DIR}/nightly-cmake.sh" "cd ${_TEST_DIR} -${CMake_BINARY_DIR}/bin/cmake -DCMAKE_CREATE_VERSION=master -P ${CMake_SOURCE_DIR}/Utilities/Release/${script} +${CMake_BINARY_DIR}/bin/cmake -DCMAKE_CREATE_VERSION=next -P ${CMake_SOURCE_DIR}/Utilities/Release/${script} ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/Release/upload_release.cmake ") ADD_TEST(${name} /bin/sh ${_TEST_DIR}/nightly-cmake.sh) diff --git a/Utilities/Release/dash2win64_release.cmake b/Utilities/Release/dash2win64_release.cmake index fcf67bc..94decdd 100644 --- a/Utilities/Release/dash2win64_release.cmake +++ b/Utilities/Release/dash2win64_release.cmake @@ -12,7 +12,7 @@ CMAKE_SKIP_BOOTSTRAP_TEST:STRING=TRUE CMAKE_Fortran_COMPILER:FILEPATH=FALSE CMAKE_GENERATOR:INTERNAL=Unix Makefiles BUILD_QtDialog:BOOL:=TRUE -QT_QMAKE_EXECUTABLE:FILEPATH=c:/Dashboards/Support/qt-4.5.3-static/bin/qmake.exe +QT_QMAKE_EXECUTABLE:FILEPATH=c:/Dashboards/Support/qt-build/Qt/bin/qmake.exe ") get_filename_component(path "${CMAKE_CURRENT_LIST_FILE}" PATH) set(GIT_COMMAND git) |