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

simpler

parent 98671e8f
No related branches found
No related tags found
No related merge requests found
...@@ -24,14 +24,8 @@ set(SRC ...@@ -24,14 +24,8 @@ set(SRC
onelabUtils.cpp onelabUtils.cpp
GamePad.cpp GamePad.cpp
GmshRemote.cpp GmshRemote.cpp
)
if(ENABLE_ONELAB AND NOT ENABLE_ONELAB2)
set(SRC
${SRC}
gmshLocalNetworkClient.cpp gmshLocalNetworkClient.cpp
) )
endif(ENABLE_ONELAB AND NOT ENABLE_ONELAB2)
file(GLOB HDR RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.h) file(GLOB HDR RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.h)
append_gmsh_src(Common "${SRC};${HDR}") append_gmsh_src(Common "${SRC};${HDR}")
...@@ -3,19 +3,22 @@ ...@@ -3,19 +3,22 @@
// 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>.
#include "gmshLocalNetworkClient.h"
#include "GmshConfig.h" #include "GmshConfig.h"
#include "Gmsh.h" #include "Gmsh.h"
#include "Context.h" #include "Context.h"
#include "OS.h" #include "OS.h"
#include "StringUtils.h" #include "StringUtils.h"
#include "onelabUtils.h"
#include "OpenFile.h" #include "OpenFile.h"
#include "CreateFile.h" #include "CreateFile.h"
#include "PView.h" #include "PView.h"
#include "Options.h" #include "Options.h"
#include "GModel.h" #include "GModel.h"
#if defined(HAVE_ONELAB)
#include "gmshLocalNetworkClient.h"
#include "onelabUtils.h"
#if defined(HAVE_FLTK) #if defined(HAVE_FLTK)
#include "FlGui.h" #include "FlGui.h"
#include "onelabGroup.h" #include "onelabGroup.h"
...@@ -862,3 +865,4 @@ void solver_batch_cb(void *data) ...@@ -862,3 +865,4 @@ void solver_batch_cb(void *data)
} }
} }
#endif
...@@ -8,6 +8,10 @@ ...@@ -8,6 +8,10 @@
#include <vector> #include <vector>
#include <algorithm> #include <algorithm>
#include "GmshConfig.h"
#if defined(HAVE_ONELAB)
#include "onelab.h" #include "onelab.h"
class gmshLocalNetworkClient : public onelab::localNetworkClient{ class gmshLocalNetworkClient : public onelab::localNetworkClient{
...@@ -58,15 +62,9 @@ class gmshLocalNetworkClient : public onelab::localNetworkClient{ ...@@ -58,15 +62,9 @@ class gmshLocalNetworkClient : public onelab::localNetworkClient{
} }
return n; return n;
} }
#ifdef HAVE_ONELAB2 // Useless code in onelab2
bool receiveMessage(gmshLocalNetworkClient *master){return true;}
bool run(){return true;}
bool kill(){return true;}
#else
bool receiveMessage(gmshLocalNetworkClient *master); bool receiveMessage(gmshLocalNetworkClient *master);
bool run(); bool run();
bool kill(); bool kill();
#endif
}; };
// FIXME: move this to onelabUtils // FIXME: move this to onelabUtils
...@@ -82,3 +80,5 @@ void resetDb(bool runGmshClient); ...@@ -82,3 +80,5 @@ void resetDb(bool runGmshClient);
void solver_batch_cb(void *data); void solver_batch_cb(void *data);
#endif #endif
#endif
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment