From 25a6560eaecb70c34be0cdea21a9384ed492f0aa Mon Sep 17 00:00:00 2001
From: Gaetan Bricteux <gaetan.bricteux@uclouvain.be>
Date: Mon, 2 Jan 2012 10:57:20 +0000
Subject: [PATCH] fix compile for onelab & fltk1.1
---
Fltk/menuWindow.cpp | 3 +++
Fltk/onelabWindow.cpp | 19 ++++++++++++++++++-
2 files changed, 21 insertions(+), 1 deletion(-)
diff --git a/Fltk/menuWindow.cpp b/Fltk/menuWindow.cpp
index ef667da9a3..908262d67e 100644
--- a/Fltk/menuWindow.cpp
+++ b/Fltk/menuWindow.cpp
@@ -54,6 +54,9 @@ typedef unsigned long intptr_t;
#include "Generator.h"
#include "HighOrder.h"
#include "Field.h"
+#if defined(HAVE_ONELAB)
+#include "onelab.h"
+#endif
static void file_new_cb(Fl_Widget *w, void *data)
{
diff --git a/Fltk/onelabWindow.cpp b/Fltk/onelabWindow.cpp
index 9209b8aa5f..3aada903e0 100644
--- a/Fltk/onelabWindow.cpp
+++ b/Fltk/onelabWindow.cpp
@@ -7,6 +7,10 @@
#include "GmshConfig.h"
#include "GmshMessage.h"
+#if defined(HAVE_ONELAB)
+#include "onelab.h"
+#endif
+
#if defined(HAVE_ONELAB) && (FL_MAJOR_VERSION == 1) && (FL_MINOR_VERSION == 3)
#include <FL/Fl_Check_Button.H>
@@ -30,7 +34,6 @@
#include "paletteWindow.h"
#include "menuWindow.h"
#include "fileDialogs.h"
-#include "onelab.h"
#include "onelabWindow.h"
// This file contains the Gmsh/FLTK specific parts of the OneLab
@@ -1020,6 +1023,20 @@ void solver_cb(Fl_Widget *w, void *data)
#else
+#if defined(HAVE_ONELAB)
+bool onelab::localNetworkClient::run(const std::string &what)
+{
+ Msg::Error("The solver interface requires OneLab and FLTK 1.3");
+ return false;
+}
+
+bool onelab::localNetworkClient::kill()
+{
+ Msg::Error("The solver interface requires OneLab and FLTK 1.3");
+ return false;
+}
+#endif
+
void solver_cb(Fl_Widget *w, void *data)
{
Msg::Error("The solver interface requires OneLab and FLTK 1.3");
--
GitLab