From afd2937a79e63ece453d85df8f46d5a45e0293d4 Mon Sep 17 00:00:00 2001 From: Christophe Geuzaine <cgeuzaine@ulg.ac.be> Date: Sun, 25 May 2014 17:31:21 +0000 Subject: [PATCH] --- utils/nightly/gmsh_msvc.ctest | 8 ++++---- utils/nightly/gmsh_win64.ctest | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/utils/nightly/gmsh_msvc.ctest b/utils/nightly/gmsh_msvc.ctest index 00b6466d2c..f76401e276 100644 --- a/utils/nightly/gmsh_msvc.ctest +++ b/utils/nightly/gmsh_msvc.ctest @@ -3,9 +3,9 @@ # 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/xxxxxxxxxxxxxcmake.exe") +set(CTEST_CMAKE_COMMAND "/cygdrive/c/Program\ Files\ \(x86\)/CMake\ 2.8/bin/cmake.exe") set(CTEST_BINARY_DIRECTORY "$ENV{HOME}/src/gmsh/bin_msvc") -set(CTEST_CMAKE_GENERATOR "xxxxxxxxxxxxxxxxxnix Makefiles") +set(CTEST_CMAKE_GENERATOR "Visual Studio 11") set(WEB_BIN "geuzaine@geuz.org:/home/www/geuz.org/gmsh/bin/Windows") @@ -14,8 +14,8 @@ set(WITH_COVERAGE FALSE) # check code coverage? set(WITH_MEMCHECK FALSE) # check memory with valgrind? ################################################################################# -set(CTEST_BUILD_NAME "Win64-VisualStudio") +set(CTEST_BUILD_NAME "Win64-msvc") set(OPT "-DGMSH_EXTRA_VERSION=${EXTRA_VERSION}") 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.ctest b/utils/nightly/gmsh_win64.ctest index 5c94cb5fc4..3814217396 100644 --- a/utils/nightly/gmsh_win64.ctest +++ b/utils/nightly/gmsh_win64.ctest @@ -24,6 +24,7 @@ set(OPT "${OPT} -DCMAKE_PREFIX_PATH:path=/usr/local/opencascade;/usr/local;/usr/ set(OPT "${OPT} -DCMAKE_C_COMPILER=/usr/bin/x86_64-w64-mingw32-gcc.exe") set(OPT "${OPT} -DCMAKE_CXX_COMPILER=/usr/bin/x86_64-w64-mingw32-g++.exe") set(OPT "${OPT} -DCMAKE_Fortran_COMPILER=/usr/bin/x86_64-w64-mingw32-gfortran.exe") +set(OPT "${OPT} -DCMAKE_RC_COMPILER=/usr/bin/x86_64-w64-mingw32-windres.exe") set(OPT "${OPT} -DPETSC_ARCH=win64_complex_mumps_seq") set(OPT "${OPT} -DPETSC_DIR=$ENV{HOME}/src/petsc-3.1-p8") set(OPT "${OPT} -DSLEPC_DIR=$ENV{HOME}/src/slepc-3.1-p6") -- GitLab