From c3de792ab2830c4040264ecaa8dde6c41ed12db1 Mon Sep 17 00:00:00 2001
From: Julien Malik <julien.malik@c-s.fr>
Date: Fri, 20 Feb 2015 15:47:02 +0100
Subject: [PATCH] COMP: make CurlAdapter react to OTB_USE_CURL compilation
macro
---
.../Adapters/CurlAdapters/include/otbCurlHelperInterface.h | 1 -
Modules/Adapters/CurlAdapters/src/otbCurlHelper.cxx | 7 +++++--
.../Adapters/CurlAdapters/src/otbCurlHelperInterface.cxx | 6 +++++-
3 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/Modules/Adapters/CurlAdapters/include/otbCurlHelperInterface.h b/Modules/Adapters/CurlAdapters/include/otbCurlHelperInterface.h
index 20176d0b2a..fb8f07b18c 100644
--- a/Modules/Adapters/CurlAdapters/include/otbCurlHelperInterface.h
+++ b/Modules/Adapters/CurlAdapters/include/otbCurlHelperInterface.h
@@ -21,7 +21,6 @@
#include <iosfwd>
#include "itkObject.h"
#include "itkObjectFactory.h"
-#include "otbConfigure.h"
namespace otb
{
diff --git a/Modules/Adapters/CurlAdapters/src/otbCurlHelper.cxx b/Modules/Adapters/CurlAdapters/src/otbCurlHelper.cxx
index 2c5bab2870..b27994f5fd 100644
--- a/Modules/Adapters/CurlAdapters/src/otbCurlHelper.cxx
+++ b/Modules/Adapters/CurlAdapters/src/otbCurlHelper.cxx
@@ -20,10 +20,13 @@
#include <cstring>
#include <sstream>
#include <itkLightObject.h>
-#include "otb_curl.h"
-#include "otbCurlHelper.h"
+#include "otbConfigure.h" // for OTB_USE_CURL
#include "otbMacro.h"
+#include "otbCurlHelper.h"
+#ifdef OTB_USE_CURL
+# include "otb_curl.h"
+#endif
namespace otb
{
diff --git a/Modules/Adapters/CurlAdapters/src/otbCurlHelperInterface.cxx b/Modules/Adapters/CurlAdapters/src/otbCurlHelperInterface.cxx
index c68f801648..b57a8cef59 100644
--- a/Modules/Adapters/CurlAdapters/src/otbCurlHelperInterface.cxx
+++ b/Modules/Adapters/CurlAdapters/src/otbCurlHelperInterface.cxx
@@ -16,9 +16,13 @@
=========================================================================*/
-#include "otb_curl.h"
+#include "otbConfigure.h" // for OTB_USE_CURL
#include "otbCurlHelperInterface.h"
+#ifdef OTB_USE_CURL
+# include "otb_curl.h"
+#endif
+
namespace otb {
bool
--
GitLab