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

No commit message

No commit message
parent 432bead4
Branches
Tags
No related merge requests found
...@@ -26,9 +26,6 @@ set(CTEST_UPDATE_COMMAND "${CTEST_SVN_COMMAND}") ...@@ -26,9 +26,6 @@ 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} ${CTEST_BUILD_OPTIONS}")
if(BUILD_DYNAMIC)
set(CTEST_CONFIGURE_COMMAND "${CTEST_CONFIGURE_COMMAND} -DENABLE_BUILD_DYNAMIC=1")
endif(BUILD_DYNAMIC)
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_SOURCE_DIRECTORY}\"") set(CTEST_CONFIGURE_COMMAND "${CTEST_CONFIGURE_COMMAND} \"${CTEST_SOURCE_DIRECTORY}\"")
......
...@@ -26,7 +26,7 @@ set(OPT "${OPT} -DPETSC_ARCH=linux_complex_mumps_seq") ...@@ -26,7 +26,7 @@ set(OPT "${OPT} -DPETSC_ARCH=linux_complex_mumps_seq")
set(OPT "${OPT} -DPETSC_DIR=$ENV{HOME}/src/petsc-3.1-p8") set(OPT "${OPT} -DPETSC_DIR=$ENV{HOME}/src/petsc-3.1-p8")
set(OPT "${OPT} -DSLEPC_DIR=$ENV{HOME}/src/slepc-3.1-p4") set(OPT "${OPT} -DSLEPC_DIR=$ENV{HOME}/src/slepc-3.1-p4")
if(BUILD_DYNAMIC) if(BUILD_DYNAMIC)
set(OPT "${OPT} -DENABLE_WRAP_PYTHON=1") set(OPT "${OPT} -DENABLE_BUILD_DYNAMIC=1 -DENABLE_WRAP_PYTHON=1")
endif(BUILD_DYNAMIC) endif(BUILD_DYNAMIC)
set(CTEST_BUILD_OPTIONS ${OPT}) set(CTEST_BUILD_OPTIONS ${OPT})
include(gmsh.ctest) include(gmsh.ctest)
......
...@@ -27,7 +27,7 @@ set(OPT "${OPT} -DPETSC_ARCH=macosx_complex_mumps_seq") ...@@ -27,7 +27,7 @@ set(OPT "${OPT} -DPETSC_ARCH=macosx_complex_mumps_seq")
set(OPT "${OPT} -DPETSC_DIR=$ENV{HOME}/src/petsc-3.1-p8") set(OPT "${OPT} -DPETSC_DIR=$ENV{HOME}/src/petsc-3.1-p8")
set(OPT "${OPT} -DSLEPC_DIR=$ENV{HOME}/src/slepc-3.1-p6") set(OPT "${OPT} -DSLEPC_DIR=$ENV{HOME}/src/slepc-3.1-p6")
if(BUILD_DYNAMIC) if(BUILD_DYNAMIC)
set(OPT "${OPT} -DENABLE_WRAP_PYTHON=1") set(OPT "${OPT} -DENABLE_BUILD_DYNAMIC=1 -DENABLE_WRAP_PYTHON=1")
set(OPT "${OPT} -DENABLE_OS_SPECIFIC_INSTALL=0") set(OPT "${OPT} -DENABLE_OS_SPECIFIC_INSTALL=0")
endif(BUILD_DYNAMIC) endif(BUILD_DYNAMIC)
set(CTEST_BUILD_OPTIONS ${OPT}) set(CTEST_BUILD_OPTIONS ${OPT})
......
...@@ -28,6 +28,9 @@ set(OPT "${OPT} -DCMAKE_RC_COMPILER=/usr/bin/x86_64-w64-mingw32-windres.exe") ...@@ -28,6 +28,9 @@ 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_ARCH=win64_complex_mumps_seq")
set(OPT "${OPT} -DPETSC_DIR=$ENV{HOME}/src/petsc-3.1-p8") set(OPT "${OPT} -DPETSC_DIR=$ENV{HOME}/src/petsc-3.1-p8")
set(OPT "${OPT} -DSLEPC_DIR=$ENV{HOME}/src/slepc-3.1-p6") set(OPT "${OPT} -DSLEPC_DIR=$ENV{HOME}/src/slepc-3.1-p6")
if(BUILD_DYNAMIC)
set(OPT "${OPT} -DENABLE_BUILD_DYNAMIC=1")
endif(BUILD_DYNAMIC)
set(CTEST_BUILD_OPTIONS ${OPT}) set(CTEST_BUILD_OPTIONS ${OPT})
include(gmsh.ctest) include(gmsh.ctest)
if(BUILD_DYNAMIC) if(BUILD_DYNAMIC)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment