From 1a3471cbe64cb5a08bd177fdd5590c2f8385c91a Mon Sep 17 00:00:00 2001
From: Guillaume Pasero <guillaume.pasero@c-s.fr>
Date: Tue, 3 Feb 2015 10:56:53 +0100
Subject: [PATCH] ENH: add tinyXML dependency in Ice
---
CMake/External_Ice.cmake | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/CMake/External_Ice.cmake b/CMake/External_Ice.cmake
index e74d837815..dda3fddeaf 100644
--- a/CMake/External_Ice.cmake
+++ b/CMake/External_Ice.cmake
@@ -38,6 +38,16 @@ else()
list(APPEND ${proj}_DEPENDENCIES ITK)
endif()
+if(USE_SYSTEM_TINYXML)
+ set(ICE_SB_TINYXML_CONFIG)
+else()
+ set(ICE_SB_TINYXML_CONFIG
+ -DTINYXML_INCLUDE_DIR:PATH=${CMAKE_INSTALL_PREFIX}/include
+ -DTINYXML_LIBRARY:PATH=${CMAKE_INSTALL_PREFIX}/lib/libtinyXML${CMAKE_SHARED_LIBRARY_SUFFIX}
+ )
+ list(APPEND ${proj}_DEPENDENCIES TINYXML)
+endif()
+
if(MSVC)
set(ICE_SB_ITK_CONFIG)
set(ICE_SB_GLEW_CONFIG)
@@ -61,7 +71,8 @@ ExternalProject_Add(${proj}
-DOTB_DIR:PATH=${CMAKE_INSTALL_PREFIX}/lib/otb
${ICE_SB_ITK_CONFIG}
${ICE_SB_GLFW_CONFIG}
- ${ICE_SB_GLEW_CONFIG}
+ ${ICE_SB_GLEW_CONFIG}
+ ${ICE_SB_TINYXML_CONFIG}
)
message(STATUS " Using Ice SuperBuild version")
--
GitLab