From ed53c98b9b99cf9151de8f54d1f3b1c83b0df0f8 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Sun, 25 May 2014 19:05:17 +0000
Subject: [PATCH]
---
utils/nightly/gmsh.ctest | 3 ---
utils/nightly/gmsh_linux64.ctest | 2 +-
utils/nightly/gmsh_mac.ctest | 2 +-
utils/nightly/gmsh_win64.ctest | 3 +++
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/utils/nightly/gmsh.ctest b/utils/nightly/gmsh.ctest
index 93422cb692..e727ea8608 100644
--- a/utils/nightly/gmsh.ctest
+++ b/utils/nightly/gmsh.ctest
@@ -26,9 +26,6 @@ set(CTEST_UPDATE_COMMAND "${CTEST_SVN_COMMAND}")
set(CTEST_CONFIGURE_COMMAND
"${CTEST_CMAKE_COMMAND} -DCMAKE_BUILD_TYPE:STRING=${CTEST_BUILD_CONFIGURATION}")
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} \"${CTEST_SOURCE_DIRECTORY}\"")
diff --git a/utils/nightly/gmsh_linux64.ctest b/utils/nightly/gmsh_linux64.ctest
index 3edb9aa146..3c3654058f 100644
--- a/utils/nightly/gmsh_linux64.ctest
+++ b/utils/nightly/gmsh_linux64.ctest
@@ -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} -DSLEPC_DIR=$ENV{HOME}/src/slepc-3.1-p4")
if(BUILD_DYNAMIC)
- set(OPT "${OPT} -DENABLE_WRAP_PYTHON=1")
+ set(OPT "${OPT} -DENABLE_BUILD_DYNAMIC=1 -DENABLE_WRAP_PYTHON=1")
endif(BUILD_DYNAMIC)
set(CTEST_BUILD_OPTIONS ${OPT})
include(gmsh.ctest)
diff --git a/utils/nightly/gmsh_mac.ctest b/utils/nightly/gmsh_mac.ctest
index 9d638b6e38..7d9db85f51 100644
--- a/utils/nightly/gmsh_mac.ctest
+++ b/utils/nightly/gmsh_mac.ctest
@@ -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} -DSLEPC_DIR=$ENV{HOME}/src/slepc-3.1-p6")
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")
endif(BUILD_DYNAMIC)
set(CTEST_BUILD_OPTIONS ${OPT})
diff --git a/utils/nightly/gmsh_win64.ctest b/utils/nightly/gmsh_win64.ctest
index 3814217396..86c684fa7f 100644
--- a/utils/nightly/gmsh_win64.ctest
+++ b/utils/nightly/gmsh_win64.ctest
@@ -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_DIR=$ENV{HOME}/src/petsc-3.1-p8")
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})
include(gmsh.ctest)
if(BUILD_DYNAMIC)
--
GitLab