From a919d8ad81c3df991d14b631d99af528642812b8 Mon Sep 17 00:00:00 2001
From: Julien Michel <julien.michel@c-s.fr>
Date: Mon, 22 Sep 2008 08:22:21 +0000
Subject: [PATCH] COMP: Removing direct access to expat/lib, causing
compilation errors when using internal ITK and building shared libraries.
---
Utilities/otbexpat/CMakeLists.txt | 1 -
otbIncludeDirectories.cmake | 6 ++----
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/Utilities/otbexpat/CMakeLists.txt b/Utilities/otbexpat/CMakeLists.txt
index bc63d9c0df..bfee381e4d 100644
--- a/Utilities/otbexpat/CMakeLists.txt
+++ b/Utilities/otbexpat/CMakeLists.txt
@@ -13,7 +13,6 @@ SET(libexpat_VERSION_STRING "${libexpat_VERSION_MAJOR}.${libexpat_VERSION_MINOR}
# Allow sources in subdirectories to see the include files.
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/lib)
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
# Build libexpat library
diff --git a/otbIncludeDirectories.cmake b/otbIncludeDirectories.cmake
index 5b432ed855..854bb45bbe 100644
--- a/otbIncludeDirectories.cmake
+++ b/otbIncludeDirectories.cmake
@@ -142,8 +142,7 @@ IF(OTB_USE_EXTERNAL_EXPAT)
${EXPAT_INCLUDE_DIR} )
ELSE(OTB_USE_EXTERNAL_EXPAT)
SET(OTB_INCLUDE_DIRS_BUILD_TREE_CXX ${OTB_INCLUDE_DIRS_BUILD_TREE_CXX}
- ${OTB_SOURCE_DIR}/Utilities/otbexpat
- ${OTB_SOURCE_DIR}/Utilities/otbexpat/lib )
+ ${OTB_SOURCE_DIR}/Utilities/otbexpat)
ENDIF(OTB_USE_EXTERNAL_EXPAT)
# For OpenThreads
@@ -225,8 +224,7 @@ IF(OTB_USE_EXTERNAL_EXPAT)
${EXPAT_INCLUDE_DIR} )
ELSE(OTB_USE_EXTERNAL_EXPAT)
SET(OTB_INCLUDE_DIRS_INSTALL_TREE ${OTB_INCLUDE_DIRS_INSTALL_TREE}
- ${OTB_INSTALL_INCLUDE_DIR}/Utilities/otbexpat
- ${OTB_INSTALL_INCLUDE_DIR}/Utilities/otbexpat/lib )
+ ${OTB_INSTALL_INCLUDE_DIR}/Utilities/otbexpat)
ENDIF(OTB_USE_EXTERNAL_EXPAT)
#For CURL header file
--
GitLab