From 11964f9ac0f16c16249cb03e0daae100da6ae7b3 Mon Sep 17 00:00:00 2001
From: Julien Malik <julien.malik@c-s.fr>
Date: Fri, 16 Mar 2012 19:35:08 +0100
Subject: [PATCH] COMP: fix TIXML_USE_STL management. wrong macro used, seen
with macport version
---
CMake/FindTinyXML.cmake | 12 +++++++-----
CMake/ImportTinyXML.cmake | 1 +
CMake/otbConfigure.h.in | 4 ++--
3 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/CMake/FindTinyXML.cmake b/CMake/FindTinyXML.cmake
index da71480783..4a34fb154a 100644
--- a/CMake/FindTinyXML.cmake
+++ b/CMake/FindTinyXML.cmake
@@ -1,9 +1,11 @@
# - Find TinyXML
# Find the native TinyXML includes and library
#
-# TINYXML_FOUND - True if TinyXML found.
-# TINYXML_INCLUDE_DIR - where to find tinyxml.h, etc.
-# TINYXML_LIBRARIES - List of libraries when using TinyXML.
+# TINYXML_FOUND - True if TinyXML found.
+# TINYXML_INCLUDE_DIRS - where to find tinyxml.h, etc.
+# TINYXML_LIBRARIES - List of libraries when using TinyXML.
+# TIXML_USE_STL - ON or undefined whether STL support is found
+# can be used directly in a #cmakedefine
#
IF( TINYXML_INCLUDE_DIR )
@@ -31,7 +33,7 @@ IF(TINYXML_FOUND)
SET(TINYXML_LIBRARIES ${TINYXML_LIBRARY})
# Check if STL support is enabled with macro TIXML_USE_STL
- TRY_COMPILE(TINYXML_USE_STL
+ TRY_COMPILE(TIXML_USE_STL
${CMAKE_CURRENT_BINARY_DIR}/CMake
${CMAKE_CURRENT_SOURCE_DIR}/CMake/otbTestTinyXMLUseSTL.cxx
CMAKE_FLAGS "-DINCLUDE_DIRECTORIES:PATH=${TINYXML_INCLUDE_DIRS}" "-DLINK_LIBRARIES:STRING=${TINYXML_LIBRARIES}"
@@ -42,6 +44,6 @@ ELSE(TINYXML_FOUND)
SET(TINYXML_INCLUDE_DIRS)
SET(TINYXML_LIBRARIES)
- SET(TINYXML_USE_STL)
+ SET(TIXML_USE_STL)
ENDIF(TINYXML_FOUND)
diff --git a/CMake/ImportTinyXML.cmake b/CMake/ImportTinyXML.cmake
index 8cdae4a9b4..260f4b13b8 100644
--- a/CMake/ImportTinyXML.cmake
+++ b/CMake/ImportTinyXML.cmake
@@ -8,3 +8,4 @@ ELSE(TINYXML_FOUND)
SET(TINYXML_LIBRARIES otbtinyXML)
ENDIF(TINYXML_FOUND)
MARK_AS_ADVANCED(OTB_USE_EXTERNAL_TINYXML)
+
diff --git a/CMake/otbConfigure.h.in b/CMake/otbConfigure.h.in
index b3d00f9cd2..3c242461c9 100644
--- a/CMake/otbConfigure.h.in
+++ b/CMake/otbConfigure.h.in
@@ -69,8 +69,8 @@
#cmakedefine OTB_USE_SIFTFAST
/* TinyXML Has STL */
-#ifndef TINYXML_USE_STL
-#cmakedefine TINYXML_USE_STL
+#ifndef TIXML_USE_STL
+#cmakedefine TIXML_USE_STL
#endif
/* Use Visu/Gui configurations */
--
GitLab