From 0088d9d68e7152965fd94c57a1ec4ba267c428f1 Mon Sep 17 00:00:00 2001
From: Markus Blatt <markus@dr-blatt.de>
Date: Tue, 25 Aug 2015 17:55:33 +0200
Subject: [PATCH] [cmake,release] Explicitly list lib/include when using
NO_DEFAULT_PATH.
When using NO_DEFAULT_PATH the lib and include subdirectories will
not be searched by default by find_path and pt-scotch will not be
found outside of the standard path. This commit adds them and now
locally installed versions may supersede the system ones.
---
cmake/modules/FindPTScotch.cmake | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/cmake/modules/FindPTScotch.cmake b/cmake/modules/FindPTScotch.cmake
index a99b6580e..4a809debb 100644
--- a/cmake/modules/FindPTScotch.cmake
+++ b/cmake/modules/FindPTScotch.cmake
@@ -21,7 +21,7 @@
include(DuneMPI)
macro(_search_pt_lib libvar libname doc)
find_library(${libvar} ${libname}
- PATHS ${PTSCOTCH_ROOT} PATH_SUFFIXES ${PATH_SUFFIXES}
+ PATHS ${PTSCOTCH_ROOT} ${PTSCOTCH_ROOT}/lib PATH_SUFFIXES ${PATH_SUFFIXES}
NO_DEFAULT_PATH
DOC "${doc}")
find_library(${libvar} ${libname})
@@ -39,7 +39,7 @@ set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${MPI_DUNE_INCLUDE_PATH})
set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} ${MPI_DUNE_COMPILE_FLAGS}")
find_path(PTSCOTCH_INCLUDE_DIR ptscotch.h
- PATHS ${PTSCOTCH_ROOT}
+ PATHS ${PTSCOTCH_ROOT} ${PTSCOTCH_ROOT}/include
PATH_SUFFIXES ${PATH_SUFFIXES}
NO_DEFAULT_PATH
DOC "Include directory of PT-Scotch")
--
GitLab