From 4dc969b4b9a2c6c3507d61afb3625a84127d19f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Steffen=20M=C3=BCthing?= <muething@dune-project.org>
Date: Fri, 5 Feb 2016 17:16:55 +0100
Subject: [PATCH] [CMake] Make backported UMFPACK test work seamlessly for DUNE
2.4
- Disable deprecation warning
- Populate SuiteSparse_ROOT from UMFPACK_ROOT if necessary
---
cmake/modules/FindUMFPack.cmake | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/cmake/modules/FindUMFPack.cmake b/cmake/modules/FindUMFPack.cmake
index 321d7888c..44cae3604 100644
--- a/cmake/modules/FindUMFPack.cmake
+++ b/cmake/modules/FindUMFPack.cmake
@@ -14,10 +14,11 @@
# UMFPACK_LIBRARIES Name of the UMFPack libraries
#
-find_package(SuiteSparse OPTIONAL_COMPONENTS UMFPACK)
+if((DEFINED UMFPACK_ROOT) AND (NOT DEFINED SuiteSparse_ROOT))
+ set(SuiteSparse_ROOT "${UMFPACK_ROOT}")
+endif()
-# use find_package(SuiteSparse OPTIONAL_COMPONENTS UMFPACK) instead
-message(WARNING "find_package(UMFPack) is deprecated, please use FindSuiteSparse instead")
+find_package(SuiteSparse OPTIONAL_COMPONENTS UMFPACK)
set(UMFPACK_INCLUDE_DIRS ${SuiteSparse_INCLUDE_DIRS})
set(UMFPACK_LIBRARIES ${SuiteSparse_LIBRARIES})
--
GitLab