From a21ab01a36a86168340cb2f9f178e56c0e460ba8 Mon Sep 17 00:00:00 2001
From: Florent Pruvost <florent.pruvost@inria.fr>
Date: Fri, 30 Jan 2015 07:47:54 +0000
Subject: [PATCH] remove obsolete code, cmake variables are already properly
set here
---
cmake_modules/morse/find/FindHWLOC.cmake | 6 +-----
cmake_modules/morse/find/FindQUARK.cmake | 6 +-----
2 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/cmake_modules/morse/find/FindHWLOC.cmake b/cmake_modules/morse/find/FindHWLOC.cmake
index ff1be15ea..a7c38315c 100644
--- a/cmake_modules/morse/find/FindHWLOC.cmake
+++ b/cmake_modules/morse/find/FindHWLOC.cmake
@@ -218,11 +218,7 @@ if(NOT HWLOC_FOUND OR NOT HWLOC_LIBRARIES)
check_function_exists(hwloc_topology_init HWLOC_WORKS)
mark_as_advanced(HWLOC_WORKS)
- if(HWLOC_WORKS)
- set(HWLOC_LIBRARIES "${CMAKE_REQUIRED_LIBRARIES}")
- set(HWLOC_LIBRARY_DIRS "${HWLOC_LIBRARY_DIRS}")
- set(HWLOC_INCLUDE_DIRS "${CMAKE_REQUIRED_INCLUDES}")
- else()
+ if(NOT HWLOC_WORKS)
if (HWLOC_FIND_REQUIRED)
if(NOT HWLOC_FIND_QUIETLY)
message(STATUS "Looking for hwloc : test of hwloc_topology_init with hwloc library fails")
diff --git a/cmake_modules/morse/find/FindQUARK.cmake b/cmake_modules/morse/find/FindQUARK.cmake
index 8920bdafb..f2cc2d11b 100644
--- a/cmake_modules/morse/find/FindQUARK.cmake
+++ b/cmake_modules/morse/find/FindQUARK.cmake
@@ -194,11 +194,7 @@ if(QUARK_LIBRARIES)
check_function_exists(QUARK_New QUARK_WORKS)
mark_as_advanced(QUARK_WORKS)
- if(QUARK_WORKS)
- set(QUARK_LIBRARIES "${CMAKE_REQUIRED_LIBRARIES}")
- set(QUARK_LIBRARY_DIRS "${QUARK_LIBRARY_DIRS}")
- set(QUARK_INCLUDE_DIRS "${CMAKE_REQUIRED_INCLUDES}")
- else()
+ if(NOT QUARK_WORKS)
if (QUARK_FIND_REQUIRED)
if(NOT QUARK_FIND_QUIETLY)
message(STATUS "Looking for quark : test of QUARK_New with quark library fails")
--
GitLab