From 98671e8f0ba716640f3bb88baec4d3bcb423789e Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Fri, 13 Feb 2015 13:13:31 +0000
Subject: [PATCH] fix compile
---
Common/CMakeLists.txt | 2 +-
Common/GmshRemote.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Common/CMakeLists.txt b/Common/CMakeLists.txt
index bceaadf833..440ddc255e 100644
--- a/Common/CMakeLists.txt
+++ b/Common/CMakeLists.txt
@@ -23,12 +23,12 @@ set(SRC
MallocUtils.cpp
onelabUtils.cpp
GamePad.cpp
+ GmshRemote.cpp
)
if(ENABLE_ONELAB AND NOT ENABLE_ONELAB2)
set(SRC
${SRC}
- GmshRemote.cpp
gmshLocalNetworkClient.cpp
)
endif(ENABLE_ONELAB AND NOT ENABLE_ONELAB2)
diff --git a/Common/GmshRemote.cpp b/Common/GmshRemote.cpp
index 83b12456d7..6a97009230 100644
--- a/Common/GmshRemote.cpp
+++ b/Common/GmshRemote.cpp
@@ -19,7 +19,7 @@
#include <sstream>
#include "GmshMessage.h"
-#if defined(HAVE_ONELAB) && defined(HAVE_POST)
+#if defined(HAVE_ONELAB) && defined(HAVE_POST) && !defined(HAVE_ONELAB2)
#include "onelab.h"
#include "OpenFile.h"
--
GitLab