Skip to content
Snippets Groups Projects
Commit 807f4310 authored by Christophe Geuzaine's avatar Christophe Geuzaine
Browse files

msvc

parent 42de2c0a
No related branches found
No related tags found
No related merge requests found
...@@ -1359,7 +1359,8 @@ if(WIN32 AND NOT MSVC OR CYGWIN) ...@@ -1359,7 +1359,8 @@ if(WIN32 AND NOT MSVC OR CYGWIN)
set(CMAKE_EXE_LINK_DYNAMIC_CXX_FLAGS) set(CMAKE_EXE_LINK_DYNAMIC_CXX_FLAGS)
endif(ENABLE_BUILD_DYNAMIC) endif(ENABLE_BUILD_DYNAMIC)
elseif(MSVC) elseif(MSVC)
set_target_properties(gmsh PROPERTIES LINK_FLAGS "/STACK:16777216") set_target_properties(gmsh PROPERTIES LINK_FLAGS
"/STACK:16777216 /SAFESEH:NO")
endif(WIN32 AND NOT MSVC OR CYGWIN) endif(WIN32 AND NOT MSVC OR CYGWIN)
# parser target # parser target
......
...@@ -25,8 +25,11 @@ set(CTEST_UPDATE_COMMAND "${CTEST_SVN_COMMAND}") ...@@ -25,8 +25,11 @@ set(CTEST_UPDATE_COMMAND "${CTEST_SVN_COMMAND}")
set(CTEST_CONFIGURE_COMMAND set(CTEST_CONFIGURE_COMMAND
"${CTEST_CMAKE_COMMAND} -DCMAKE_BUILD_TYPE:STRING=${CTEST_BUILD_CONFIGURATION}") "${CTEST_CMAKE_COMMAND} -DCMAKE_BUILD_TYPE:STRING=${CTEST_BUILD_CONFIGURATION}")
set(CTEST_CONFIGURE_COMMAND "${CTEST_CONFIGURE_COMMAND} ${CTEST_BUILD_OPTIONS}")
set(CTEST_CONFIGURE_COMMAND "${CTEST_CONFIGURE_COMMAND} \"-G${CTEST_CMAKE_GENERATOR}\"") set(CTEST_CONFIGURE_COMMAND "${CTEST_CONFIGURE_COMMAND} \"-G${CTEST_CMAKE_GENERATOR}\"")
set(CTEST_CONFIGURE_COMMAND "${CTEST_CONFIGURE_COMMAND} ${CTEST_BUILD_OPTIONS}")
if(CTEST_BUILD_OPTIONS_QUOTED)
set(CTEST_CONFIGURE_COMMAND "${CTEST_CONFIGURE_COMMAND} \"${CTEST_BUILD_OPTIONS_QUOTED}\"")
endif(CTEST_BUILD_OPTIONS_QUOTED)
set(CTEST_CONFIGURE_COMMAND "${CTEST_CONFIGURE_COMMAND} \"${CTEST_SOURCE_DIRECTORY}\"") set(CTEST_CONFIGURE_COMMAND "${CTEST_CONFIGURE_COMMAND} \"${CTEST_SOURCE_DIRECTORY}\"")
# make sure everybody outputs messages in english # make sure everybody outputs messages in english
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
# See the LICENSE.txt file for license information. Please report all # See the LICENSE.txt file for license information. Please report all
# bugs and problems to the public mailing list <gmsh@geuz.org>. # bugs and problems to the public mailing list <gmsh@geuz.org>.
set(CTEST_CMAKE_COMMAND "'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_BINARY_DIRECTORY "$ENV{HOME}/src/gmsh/bin_msvc")
set(CTEST_CMAKE_GENERATOR "Visual Studio 11") set(CTEST_CMAKE_GENERATOR "Visual Studio 11")
...@@ -16,8 +16,8 @@ set(WITH_MEMCHECK FALSE) # check memory with valgrind? ...@@ -16,8 +16,8 @@ set(WITH_MEMCHECK FALSE) # check memory with valgrind?
################################################################################# #################################################################################
set(CTEST_BUILD_NAME "Win64-msvc") set(CTEST_BUILD_NAME "Win64-msvc")
set(OPT "-DGMSH_EXTRA_VERSION=${EXTRA_VERSION}") set(OPT "-DGMSH_EXTRA_VERSION=${EXTRA_VERSION}")
### set(OPT "${OPT} -DCMAKE_PREFIX_PATH='c:/Program Files/Intel/MKL/10.0.4.023'") set(OPT "${OPT} -DENABLE_FLTK=0")
set(OPT "${OPT} -DENABLE_FLTK=0 -DENABLE_BLAS_LAPACK=0") set(CTEST_BUILD_OPTIONS "${OPT}")
set(CTEST_BUILD_OPTIONS ${OPT}) set(CTEST_BUILD_OPTIONS_QUOTED "-DCMAKE_PREFIX_PATH:path=C:/Program Files/Intel/MKL/10.0.4.023/")
include(gmsh.ctest) include(gmsh.ctest)
### upload_package(${WEB_BIN} Windows 64-msvc .zip .zip) ### upload_package(${WEB_BIN} Windows 64-msvc .zip .zip)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment