From 59d1983493a95ec483b4d931afcc70b687474aa5 Mon Sep 17 00:00:00 2001
From: Mathieu Faverge <mathieu.faverge@inria.fr>
Date: Mon, 26 Apr 2021 14:04:15 +0200
Subject: [PATCH] Detect chameleon first to define hmat::hmat through chameleon
if available
---
CMakeLists.txt | 25 +++++++++++++------------
1 file changed, 13 insertions(+), 12 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f88d079..eb97134 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -91,6 +91,19 @@ if(MKL_FOUND)
set(CBLAS_INCLUDE_DIR ${MKL_INCLUDE_DIRS})
endif()
+# ========================
+# CHAMELEON
+# (Look for it before hmat so it defines h-mat first if included)
+# ========================
+if ( NOT TARGET CHAMELEON::chameleon )
+ find_package(CHAMELEON)
+ if(CHAMELEON_FOUND)
+ set(HAVE_CHAMELEON TRUE)
+ endif()
+else()
+ set(HAVE_CHAMELEON TRUE)
+endif()
+
# ========================
# HMAT-OSS
# ========================
@@ -110,18 +123,6 @@ else()
set(HAVE_HMAT TRUE)
endif()
-# ========================
-# CHAMELEON
-# ========================
-if ( NOT TARGET CHAMELEON::chameleon )
- find_package(CHAMELEON)
- if(CHAMELEON_FOUND)
- set(HAVE_CHAMELEON TRUE)
- endif()
-else()
- set(HAVE_CHAMELEON TRUE)
-endif()
-
# ========================
# HLIBPRO
# ========================
--
GitLab