From d217f77df3b913750ae3aa99ed7ab9c2e4311379 Mon Sep 17 00:00:00 2001
From: Julien Malik <julien.malik@c-s.fr>
Date: Tue, 2 Oct 2012 19:52:21 +0200
Subject: [PATCH] COMP: do not include the (buggy BTW) internal liblas includes
unconditionnally to support external liblas mode
---
CMake/otbIncludeDirectories.cmake | 23 +++++++++++++++++++++--
1 file changed, 21 insertions(+), 2 deletions(-)
diff --git a/CMake/otbIncludeDirectories.cmake b/CMake/otbIncludeDirectories.cmake
index 3ac72322a7..2686e055ff 100644
--- a/CMake/otbIncludeDirectories.cmake
+++ b/CMake/otbIncludeDirectories.cmake
@@ -42,7 +42,6 @@ SET(OTB_INCLUDE_DIRS_BUILD_TREE ${OTB_INCLUDE_DIRS_BUILD_TREE}
${OTB_SOURCE_DIR}/Utilities/otbossimplugins/ossim
${OTB_SOURCE_DIR}/Utilities/InsightJournal
${OTB_SOURCE_DIR}/Utilities/otb6S
- ${OTB_SOURCE_DIR}/Utilities/otbliblas/include
${OTB_SOURCE_DIR}/Utilities/otbedison/segm
${OTB_SOURCE_DIR}/Utilities/otbedison/prompt
${OTB_SOURCE_DIR}/Utilities/otbedison/edge
@@ -90,6 +89,16 @@ ELSE(OTB_USE_EXTERNAL_TINYXML)
${OTB_SOURCE_DIR}/Utilities/tinyXMLlib)
ENDIF(OTB_USE_EXTERNAL_TINYXML)
+IF(OTB_USE_LIBLAS)
+ IF(OTB_USE_EXTERNAL_LIBLAS)
+ SET(OTB_INCLUDE_DIRS_BUILD_TREE ${OTB_INCLUDE_DIRS_BUILD_TREE}
+ ${LIBLAS_INCLUDE_DIRS})
+ ELSE()
+ SET(OTB_INCLUDE_DIRS_BUILD_TREE ${OTB_INCLUDE_DIRS_BUILD_TREE}
+ ${OTB_SOURCE_DIR}/Utilities/otbliblas/include)
+ ENDIF()
+ENDIF()
+
IF(OTB_USE_EXTERNAL_MUPARSER)
SET(OTB_INCLUDE_DIRS_BUILD_TREE ${OTB_INCLUDE_DIRS_BUILD_TREE}
${MUPARSER_INCLUDE_DIR})
@@ -278,7 +287,6 @@ SET(OTB_INCLUDE_RELATIVE_DIRS ${OTB_INCLUDE_RELATIVE_DIRS}
Utilities/otbsvm
Utilities/InsightJournal
Utilities/otb6S
- Utilities/otbliblas/include
Utilities/otbedison
Utilities/otbconfigfile
)
@@ -336,6 +344,17 @@ ELSE(OTB_USE_EXTERNAL_FLTK)
Utilities/FLTK)
ENDIF(OTB_USE_EXTERNAL_FLTK)
+#For liblas headers
+IF(OTB_USE_LIBLAS)
+ IF(OTB_USE_EXTERNAL_LIBLAS)
+ SET(OTB_INCLUDE_ABSOLUE_DIRS ${OTB_INCLUDE_ABSOLUE_DIRS}
+ ${LIBLAS_INCLUDE_DIRS})
+ ELSE()
+ SET(OTB_INCLUDE_RELATIVE_DIRS ${OTB_INCLUDE_RELATIVE_DIRS}
+ Utilities/otbliblas/include)
+ ENDIF()
+ENDIF()
+
#For TinyXML header file
IF(OTB_USE_EXTERNAL_TINYXML)
SET(OTB_INCLUDE_ABSOLUE_DIRS ${OTB_INCLUDE_ABSOLUE_DIRS}
--
GitLab