diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1c8a30abbe9da6d81305443f65e906e098efabf7..15ac2903ce3b20e8d9afeaa6ceac72089ee0147b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -217,11 +217,10 @@ modernize_target_link_libraries(
   SCOPE
   PUBLIC
   TARGETS
-  Python3::NumPy
+  Python${PYTHON_VERSION_MAJOR}::NumPy
   INCLUDE_DIRS
-  ${NUMPY_INCLUDE_DIRS})
-target_include_directories(${PROJECT_NAME} SYSTEM
-                           PRIVATE ${PYTHON_INCLUDE_DIRS})
+  ${NUMPY_INCLUDE_DIRS}
+  ${PYTHON_INCLUDE_DIR})
 
 if(SUFFIX_SO_VERSION)
   set_target_properties(${PROJECT_NAME} PROPERTIES SOVERSION ${PROJECT_VERSION})
diff --git a/cmake b/cmake
index 6c40c9d426410bb25ff511e809192b7dedb4031c..a1f065dd2ddacc6455a820835d3be11fecfbe03e 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit 6c40c9d426410bb25ff511e809192b7dedb4031c
+Subproject commit a1f065dd2ddacc6455a820835d3be11fecfbe03e