From f65671b30dae5e81c1af8c2015bd458f49ba8bf3 Mon Sep 17 00:00:00 2001 From: Julien Michel <julien.michel@orfeo-toolbox.org> Date: Wed, 10 Feb 2010 18:24:07 +0100 Subject: [PATCH] COMP: Trying to fix curl export --- CMakeLists.txt | 3 +++ UseOTB.cmake.in | 5 +++++ otbConfigure.h.in | 3 --- 3 files changed, 8 insertions(+), 3 deletions(-) mode change 100644 => 100755 CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt old mode 100644 new mode 100755 index 98191c002e..0f332da174 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -357,6 +357,9 @@ IF(OTB_USE_CURL) "Cannot find CURL library. Please set CURL_LIBRARY or SET OTB_USE_CURL OFF.") ENDIF (NOT CURL_LIBRARY) + # Add compiler option + ADD_DEFINITIONS(-DOTB_USE_CURL) + INCLUDE_DIRECTORIES(${CURL_INCLUDE_DIR}) ENDIF(OTB_USE_CURL) diff --git a/UseOTB.cmake.in b/UseOTB.cmake.in index c3c7189dda..e4e15b41c3 100644 --- a/UseOTB.cmake.in +++ b/UseOTB.cmake.in @@ -127,3 +127,8 @@ IF(OTB_USE_EXTERNAL_GDAL) ENDIF(NOT GDAL_FOUND) INCLUDE_DIRECTORIES(${GDAL_INCLUDE_DIR}) ENDIF(OTB_USE_EXTERNAL_GDAL) + +# The use curl definition +IF(OTB_USE_CURL) +ADD_DEFINITIONS(-DOTB_USE_CURL) +ENDIF(OTB_USE_CURL) diff --git a/otbConfigure.h.in b/otbConfigure.h.in index bacfe2237c..6c5f35e934 100644 --- a/otbConfigure.h.in +++ b/otbConfigure.h.in @@ -66,9 +66,6 @@ /* Use Visu/Gui configurations */ #cmakedefine OTB_USE_VISU_GUI -/** Add the use curl directive */ -#cmakedefine OTB_USE_CURL - #cmakedefine OTB_I18N #define OTB_LANG @OTB_LANG@ #define OTB_LANG_LOCATION @OTB_LANG_LOCATION@ -- GitLab