diff --git a/CMake/FindTinyXML.cmake b/CMake/FindTinyXML.cmake
index 4a34fb154ac8db35eda3a369233296bb627d2e1e..7890c9ee99a9c65974a2273f722c80aa03cadb60 100644
--- a/CMake/FindTinyXML.cmake
+++ b/CMake/FindTinyXML.cmake
@@ -4,8 +4,6 @@
 #   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 )
@@ -32,18 +30,9 @@ IF(TINYXML_FOUND)
   SET(TINYXML_INCLUDE_DIRS ${TINYXML_INCLUDE_DIR})
   SET(TINYXML_LIBRARIES    ${TINYXML_LIBRARY})
 
-  # Check if STL support is enabled with macro TIXML_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}"
-              COMPILE_DEFINITIONS "-DTIXML_USE_STL"
-              OUTPUT_VARIABLE OUTPUT)
-
 ELSE(TINYXML_FOUND)
 
   SET(TINYXML_INCLUDE_DIRS)
   SET(TINYXML_LIBRARIES)
-  SET(TIXML_USE_STL)
 
 ENDIF(TINYXML_FOUND)
diff --git a/CMake/ImportTinyXML.cmake b/CMake/ImportTinyXML.cmake
index 260f4b13b86d4d1223d158c39d4752889523c51a..b4fe87859947882b38363db7df8babe93159981b 100644
--- a/CMake/ImportTinyXML.cmake
+++ b/CMake/ImportTinyXML.cmake
@@ -3,9 +3,19 @@ FIND_PACKAGE(TinyXML)
 
 IF(TINYXML_FOUND)
   OPTION(OTB_USE_EXTERNAL_TINYXML "Use external TinyXML library." ON)
+    
+  # Check if STL support is enabled with macro TIXML_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}"
+              COMPILE_DEFINITIONS "-DTIXML_USE_STL"
+              OUTPUT_VARIABLE OUTPUT)
+
 ELSE(TINYXML_FOUND)
   OPTION(OTB_USE_EXTERNAL_TINYXML "Use external TinyXML library." OFF)
   SET(TINYXML_LIBRARIES otbtinyXML)
+  SET(TIXML_USE_STL)
 ENDIF(TINYXML_FOUND)
 MARK_AS_ADVANCED(OTB_USE_EXTERNAL_TINYXML)