diff --git a/.gitmodules b/.gitmodules
index 1c001f9d680364cb4a6a943c3fc0a7a10ed32eab..2fad9ac91de0af2125b3c26ee2a7ac348eb8d91b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -28,3 +28,6 @@
 [submodule "ThirdParty/googletest"]
 	path = ThirdParty/googletest
 	url = https://github.com/google/googletest.git
+[submodule "ThirdParty/jedbrown-cmake-modules"]
+	path = ThirdParty/jedbrown-cmake-modules
+	url = https://github.com/jedbrown/cmake-modules.git
diff --git a/ThirdParty/cmake-modules b/ThirdParty/cmake-modules
index 75678d1d80e39e2e1b14b2fd6afd0e8823e60b2b..f4b0a053e53de2f4fc75a36af1dd0eede236fc68 160000
--- a/ThirdParty/cmake-modules
+++ b/ThirdParty/cmake-modules
@@ -1 +1 @@
-Subproject commit 75678d1d80e39e2e1b14b2fd6afd0e8823e60b2b
+Subproject commit f4b0a053e53de2f4fc75a36af1dd0eede236fc68
diff --git a/ThirdParty/jedbrown-cmake-modules b/ThirdParty/jedbrown-cmake-modules
new file mode 160000
index 0000000000000000000000000000000000000000..91f96174a8b3f65e19519fa592b1571391c0e3d0
--- /dev/null
+++ b/ThirdParty/jedbrown-cmake-modules
@@ -0,0 +1 @@
+Subproject commit 91f96174a8b3f65e19519fa592b1571391c0e3d0
diff --git a/scripts/cmake/CMakeSetup.cmake b/scripts/cmake/CMakeSetup.cmake
index 685a07e37f1dd12768e3628cbc5c1f020fa8f3a2..282d0019edb2b650e3a80160a01de6bea01ca4b0 100644
--- a/scripts/cmake/CMakeSetup.cmake
+++ b/scripts/cmake/CMakeSetup.cmake
@@ -8,8 +8,9 @@ endif()
 
 # Set additional CMake modules path
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}
-  "${CMAKE_CURRENT_SOURCE_DIR}/scripts/cmake"
-  "${CMAKE_CURRENT_SOURCE_DIR}/ThirdParty/cmake-modules")
+  "${PROJECT_SOURCE_DIR}/scripts/cmake"
+  "${PROJECT_SOURCE_DIR}/ThirdParty/cmake-modules"
+  "${PROJECT_SOURCE_DIR}/ThirdParty/jedbrown-cmake-modules")
 
 list(APPEND CMAKE_PREFIX_PATH
   $ENV{HOMEBREW_ROOT}             # Homebrew package manager on Mac OS
diff --git a/scripts/cmake/SubmoduleSetup.cmake b/scripts/cmake/SubmoduleSetup.cmake
index 3942fed09441b63524d9902ca6cda5936b38eff0..80b107eceda2d766ce4b410ecf2bd61e7bdcfecf 100644
--- a/scripts/cmake/SubmoduleSetup.cmake
+++ b/scripts/cmake/SubmoduleSetup.cmake
@@ -8,6 +8,7 @@ set(REQUIRED_SUBMODULES
     ThirdParty/autocheck
     ThirdParty/cmake-modules
     ThirdParty/googletest
+    ThirdParty/jedbrown-cmake-modules
     ThirdParty/tclap
     ThirdParty/tetgen
     ThirdParty/vtkdiff