From 8e3358336dba2af42279c16a277116fc8fdfb826 Mon Sep 17 00:00:00 2001
From: Marc Chevrier <marc.chevrier@gmail.com>
Date: Sat, 2 Mar 2019 15:52:12 +0100
Subject: FindPython: Fix NumPy component include directory

Update the component added by commit 513e77550d (FindPython: Introduce
NumPy component, 2018-12-12, v3.14.0-rc1~95^2).  The `numpy/`
sub-directory should not be part of the include directory.  It should be
part of the `#include` line.
---
 Modules/FindPython/Support.cmake   | 3 +--
 Tests/FindPython/NumPy/arraytest.c | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/Modules/FindPython/Support.cmake b/Modules/FindPython/Support.cmake
index 0138b04..ef8272c 100644
--- a/Modules/FindPython/Support.cmake
+++ b/Modules/FindPython/Support.cmake
@@ -1140,9 +1140,8 @@ if ("NumPy" IN_LIST ${_PYTHON_PREFIX}_FIND_COMPONENTS AND ${_PYTHON_PREFIX}_Inte
       OUTPUT_STRIP_TRAILING_WHITESPACE)
   if (NOT _${_PYTHON_PREFIX}_RESULT)
     find_path(${_PYTHON_PREFIX}_NumPy_INCLUDE_DIR
-              NAMES arrayobject.h numpyconfig.h
+              NAMES "numpy/arrayobject.h" "numpy/numpyconfig.h"
               HINTS "${_${_PYTHON_PREFIX}_NumPy_PATH}"
-              PATH_SUFFIXES numpy
               NO_DEFAULT_PATH)
   endif()
   if(${_PYTHON_PREFIX}_NumPy_INCLUDE_DIR)
diff --git a/Tests/FindPython/NumPy/arraytest.c b/Tests/FindPython/NumPy/arraytest.c
index 135877d..db259e5 100644
--- a/Tests/FindPython/NumPy/arraytest.c
+++ b/Tests/FindPython/NumPy/arraytest.c
@@ -1,7 +1,7 @@
 #include "Python.h"
 
 #define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION
-#include "arrayobject.h"
+#include "numpy/arrayobject.h"
 
 #include <math.h>
 
-- 
cgit v0.12