From 432bead4c36a4fc6495981a5cf2cc667459bc0ab Mon Sep 17 00:00:00 2001 From: Christophe Geuzaine <cgeuzaine@ulg.ac.be> Date: Sun, 25 May 2014 18:46:40 +0000 Subject: [PATCH] --- utils/nightly/gmsh_msvc.ctest | 5 +++-- utils/nightly/gmsh_win64_nightly.bat | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/utils/nightly/gmsh_msvc.ctest b/utils/nightly/gmsh_msvc.ctest index f76401e276..9531b8c6ce 100644 --- a/utils/nightly/gmsh_msvc.ctest +++ b/utils/nightly/gmsh_msvc.ctest @@ -3,7 +3,7 @@ # See the LICENSE.txt file for license information. Please report all # bugs and problems to the public mailing list <gmsh@geuz.org>. -set(CTEST_CMAKE_COMMAND "/cygdrive/c/Program\ Files\ \(x86\)/CMake\ 2.8/bin/cmake.exe") +set(CTEST_CMAKE_COMMAND "'C:\Program Files (x86)\CMake 2.8\bin\cmake.exe'") set(CTEST_BINARY_DIRECTORY "$ENV{HOME}/src/gmsh/bin_msvc") set(CTEST_CMAKE_GENERATOR "Visual Studio 11") @@ -16,6 +16,7 @@ set(WITH_MEMCHECK FALSE) # check memory with valgrind? ################################################################################# set(CTEST_BUILD_NAME "Win64-msvc") set(OPT "-DGMSH_EXTRA_VERSION=${EXTRA_VERSION}") +set(OPT "${OPT} -DENABLE_BLAS_LAPACK=0 -DENABLE_FLTK=0") set(CTEST_BUILD_OPTIONS ${OPT}) include(gmsh.ctest) -upload_package(${WEB_BIN} Windows 64-msvc .zip .zip) +### upload_package(${WEB_BIN} Windows 64-msvc .zip .zip) diff --git a/utils/nightly/gmsh_win64_nightly.bat b/utils/nightly/gmsh_win64_nightly.bat index 1d74d859a8..ccdad66ce4 100755 --- a/utils/nightly/gmsh_win64_nightly.bat +++ b/utils/nightly/gmsh_win64_nightly.bat @@ -6,3 +6,5 @@ chdir C:\cygwin\bin bash --login -c "cd ${HOME}/src/gmsh/utils/nightly && ctest -S gmsh_win64_nightly.ctest -VV > ${HOME}/src/gmsh/nightly.log 2>&1" bash --login -c "cd ${HOME}/src/gmsh/utils/nightly && ctest -S gmsh_win64_dynamic_nightly.ctest -VV > ${HOME}/src/gmsh/nightly_dynamic.log 2>&1" + +bash --login -c "cd ${HOME}/src/gmsh/utils/nightly && /cygdrive/c/Program\ Files\ \(x86\)\CMake 2.8\bin\ctest.exe -S gmsh_msvc.ctest -VV > ${HOME}/src/gmsh/nightly_msvc.log 2>&1" -- GitLab