diff --git a/CMakeLists.txt b/CMakeLists.txt
index 08450d66c3e381d08ec681a9d803469d8b5daf62..37cf6407fc4258bee2e541798392c973b8886cb6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -203,9 +203,13 @@ TARGET_INCLUDE_DIRECTORIES(${PROJECT_NAME}
   $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>
   $<INSTALL_INTERFACE:include>)
 
-MODERNIZE_LINK(${PROJECT_NAME} SCOPE PUBLIC TARGETS Eigen3::Eigen INCLUDE_DIRS ${EIGEN3_INCLUDE_DIR})
+MODERNIZE_TARGET_LINK_LIBRARIES(${PROJECT_NAME} SCOPE PUBLIC
+  TARGETS Eigen3::Eigen
+  INCLUDE_DIRS ${EIGEN3_INCLUDE_DIR})
 
-MODERNIZE_LINK(${PROJECT_NAME} SCOPE PUBLIC TARGETS Python3::NumPy INCLUDE_DIRS ${NUMPY_INCLUDE_DIR})
+MODERNIZE_TARGET_LINK_LIBRARIES(${PROJECT_NAME} SCOPE PUBLIC
+  TARGETS Python3::NumPy
+  INCLUDE_DIRS ${NUMPY_INCLUDE_DIR})
 TARGET_INCLUDE_DIRECTORIES(${PROJECT_NAME} SYSTEM PRIVATE ${PYTHON_INCLUDE_DIRS})
 
 IF(SUFFIX_SO_VERSION)
diff --git a/cmake b/cmake
index 6491546e5a27363f759cfd2f7bb522dcaa03b5c3..63a6aaf17f0cc2b32fd41cfa012aabbac3cb007e 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit 6491546e5a27363f759cfd2f7bb522dcaa03b5c3
+Subproject commit 63a6aaf17f0cc2b32fd41cfa012aabbac3cb007e