From 49b77fc8d9cd29fadab6664d0409315e03d40a65 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Thu, 12 Feb 2015 17:29:42 +0000
Subject: [PATCH] fix compile without onelab
---
Common/CMakeLists.txt | 4 ++--
Common/Gmsh.cpp | 2 ++
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/Common/CMakeLists.txt b/Common/CMakeLists.txt
index bbdd495fe0..072823a8d0 100644
--- a/Common/CMakeLists.txt
+++ b/Common/CMakeLists.txt
@@ -26,12 +26,12 @@ set(SRC
GamePad.cpp
)
-if(NOT ENABLE_ONELAB2)
+if(ENABLE_ONELAB AND NOT ENABLE_ONELAB2)
set(SRC
${SRC}
gmshLocalNetworkClient.cpp
)
-endif(NOT ENABLE_ONELAB2)
+endif(ENABLE_ONELAB AND NOT ENABLE_ONELAB2)
file(GLOB HDR RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.h)
append_gmsh_src(Common "${SRC};${HDR}")
diff --git a/Common/Gmsh.cpp b/Common/Gmsh.cpp
index ffd8a5078b..b4351fccd4 100644
--- a/Common/Gmsh.cpp
+++ b/Common/Gmsh.cpp
@@ -278,7 +278,9 @@ int GmshBatch()
}
// launch solver (if requested)
+#if defined(HAVE_ONELAB)
solver_batch_cb((void*)CTX::instance()->launchSolverAtStartup);
+#endif
time_t now;
time(&now);
--
GitLab