diff --git a/FindCgalWidgetThirdparty.cmake b/FindCgalWidgetThirdparty.cmake
index c2a2ef0..6400b72 100644
--- a/FindCgalWidgetThirdparty.cmake
+++ b/FindCgalWidgetThirdparty.cmake
@@ -7,13 +7,14 @@ list(APPEND _ext_project_args
   SOURCE_DIR       ${CMAKE_SOURCE_DIR}/thirdparty/cgal-widget
   INSTALL_DIR      ${CMAKE_BINARY_DIR}
   BUILD_BYPRODUCTS ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}/libcgal-widget.a
-  CMAKE_ARGS       ${CMLIB_EXT_PROJ_DEFAULT_ARGS})
+  CMAKE_ARGS       ${CMLIB_EXT_PROJ_DEFAULT_ARGS}
+                   <SOURCE_DIR>)
 if(CgalWidgetThirdparty_FIND_COMPONENTS STREQUAL "headers")
   list(APPEND _ext_project_args
     BUILD_COMMAND     true
     INSTALL_COMMAND   ${CMAKE_MAKE_PROGRAM} cgal-widget-install-headers)
 endif()
-ExternalProject_Add(${_ext_project_args} <SOURCE_DIR>)
+ExternalProject_Add(${_ext_project_args})
 unset(_ext_project_args)
 
 set(CGAL_WIDGET_IS_EXTERNAL_PROJECT ON CACHE BOOL "" FORCE)
diff --git a/FindFcProtocolThirdparty.cmake b/FindFcProtocolThirdparty.cmake
index cc81004..4d03ae3 100644
--- a/FindFcProtocolThirdparty.cmake
+++ b/FindFcProtocolThirdparty.cmake
@@ -6,13 +6,14 @@ list(APPEND _ext_project_args
   fc-protocol
   SOURCE_DIR  ${CMAKE_SOURCE_DIR}/thirdparty/fc-protocol
   INSTALL_DIR ${CMAKE_BINARY_DIR}
-  CMAKE_ARGS  ${CMLIB_EXT_PROJ_DEFAULT_ARGS})
+  CMAKE_ARGS  ${CMLIB_EXT_PROJ_DEFAULT_ARGS}
+              <SOURCE_DIR>)
 if(FcProtocolThirdparty_FIND_COMPONENTS STREQUAL "headers")
   list(APPEND _ext_project_args
     BUILD_COMMAND     true
     INSTALL_COMMAND   ${CMAKE_MAKE_PROGRAM} fc-protocol-install-headers)
 endif()
-ExternalProject_Add(${_ext_project_args} <SOURCE_DIR>)
+ExternalProject_Add(${_ext_project_args})
 unset(_ext_project_args)
 
 set(FC_PROTOCOL_IS_EXTERNAL_PROJECT ON CACHE BOOL "" FORCE)
diff --git a/FindFspThirdparty.cmake b/FindFspThirdparty.cmake
index 957485c..d61066f 100644
--- a/FindFspThirdparty.cmake
+++ b/FindFspThirdparty.cmake
@@ -11,13 +11,14 @@ list(APPEND _ext_project_args
   CMAKE_ARGS       ${CMLIB_EXT_PROJ_DEFAULT_ARGS}
                    -DPREPROCMATH_PREFIX=${CMAKE_BINARY_DIR}
                    -DIONOBASE_PREFIX=${CMAKE_BINARY_DIR}
-                   -DMYXLIB_PREFIX=${CMAKE_BINARY_DIR})
+                   -DMYXLIB_PREFIX=${CMAKE_BINARY_DIR}
+                   <SOURCE_DIR>)
 if(FspThirdparty_FIND_COMPONENTS STREQUAL "headers")
   list(APPEND _ext_project_args
     BUILD_COMMAND     true
     INSTALL_COMMAND   ${CMAKE_MAKE_PROGRAM} fsp-install-headers)
 endif()
-ExternalProject_Add(${_ext_project_args} <SOURCE_DIR>)
+ExternalProject_Add(${_ext_project_args})
 unset(_ext_project_args)
 
 set(FSP_IS_EXTERNAL_PROJECT ON CACHE BOOL "" FORCE)
diff --git a/FindIonobaseThirdparty.cmake b/FindIonobaseThirdparty.cmake
index 6cf9f0b..39b123f 100644
--- a/FindIonobaseThirdparty.cmake
+++ b/FindIonobaseThirdparty.cmake
@@ -7,13 +7,14 @@ list(APPEND _ext_project_args
   SOURCE_DIR       ${CMAKE_SOURCE_DIR}/thirdparty/libionobase
   INSTALL_DIR      ${CMAKE_BINARY_DIR}
   BUILD_BYPRODUCTS ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}/libionobase.a
-  CMAKE_ARGS       ${CMLIB_EXT_PROJ_DEFAULT_ARGS})
+  CMAKE_ARGS       ${CMLIB_EXT_PROJ_DEFAULT_ARGS}
+                   <SOURCE_DIR>)
 if(IonobaseThirdparty_FIND_COMPONENTS STREQUAL "headers")
   list(APPEND _ext_project_args
     BUILD_COMMAND     true
     INSTALL_COMMAND   ${CMAKE_MAKE_PROGRAM} ionobase-install-headers)
 endif()
-ExternalProject_Add(${_ext_project_args} <SOURCE_DIR>)
+ExternalProject_Add(${_ext_project_args})
 unset(_ext_project_args)
 
 set(IONOBASE_IS_EXTERNAL_PROJECT ON CACHE BOOL "" FORCE)
diff --git a/FindMyxNotificationsThirdparty.cmake b/FindMyxNotificationsThirdparty.cmake
index 7de0e1b..56f936b 100644
--- a/FindMyxNotificationsThirdparty.cmake
+++ b/FindMyxNotificationsThirdparty.cmake
@@ -7,13 +7,14 @@ list(APPEND _ext_project_args
   SOURCE_DIR       ${CMAKE_SOURCE_DIR}/thirdparty/myx-notifications
   INSTALL_DIR      ${CMAKE_BINARY_DIR}
   BUILD_BYPRODUCTS ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}/libmyx-notifications.a
-  CMAKE_ARGS       ${CMLIB_EXT_PROJ_DEFAULT_ARGS})
+  CMAKE_ARGS       ${CMLIB_EXT_PROJ_DEFAULT_ARGS}
+                   <SOURCE_DIR>)
 if(MyxNotificationsThirdparty_FIND_COMPONENTS STREQUAL "headers")
   list(APPEND _ext_project_args
     BUILD_COMMAND     true
     INSTALL_COMMAND   ${CMAKE_MAKE_PROGRAM} myx-notifications-install-headers)
 endif()
-ExternalProject_Add(${_ext_project_args} <SOURCE_DIR>)
+ExternalProject_Add(${_ext_project_args})
 unset(_ext_project_args)
 
 set(MYX_NOTIFICATIONS_IS_EXTERNAL_PROJECT ON CACHE BOOL "" FORCE)
diff --git a/FindMyxQPingThirdparty.cmake b/FindMyxQPingThirdparty.cmake
index 4d791a6..b20f794 100644
--- a/FindMyxQPingThirdparty.cmake
+++ b/FindMyxQPingThirdparty.cmake
@@ -7,13 +7,14 @@ list(APPEND _ext_project_args
   SOURCE_DIR       ${CMAKE_SOURCE_DIR}/thirdparty/myx-qping
   INSTALL_DIR      ${CMAKE_BINARY_DIR}
   BUILD_BYPRODUCTS ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}/libmyx-qping.a
-  CMAKE_ARGS       ${CMLIB_EXT_PROJ_DEFAULT_ARGS})
+  CMAKE_ARGS       ${CMLIB_EXT_PROJ_DEFAULT_ARGS}
+                   <SOURCE_DIR>)
 if(MyxQPingThirdparty_FIND_COMPONENTS STREQUAL "headers")
   list(APPEND _ext_project_args
     BUILD_COMMAND     true
     INSTALL_COMMAND   ${CMAKE_MAKE_PROGRAM} myx-qping-install-headers)
 endif()
-ExternalProject_Add(${_ext_project_args} <SOURCE_DIR>)
+ExternalProject_Add(${_ext_project_args})
 unset(_ext_project_args)
 
 set(MYX_QPING_IS_EXTERNAL_PROJECT ON CACHE BOOL "" FORCE)
diff --git a/FindMyxRedisThirdparty.cmake b/FindMyxRedisThirdparty.cmake
index 1d15408..243c759 100644
--- a/FindMyxRedisThirdparty.cmake
+++ b/FindMyxRedisThirdparty.cmake
@@ -7,13 +7,14 @@ list(APPEND _ext_project_args
   SOURCE_DIR       ${CMAKE_SOURCE_DIR}/thirdparty/myx-redis
   INSTALL_DIR      ${CMAKE_BINARY_DIR}
   BUILD_BYPRODUCTS ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}/libmyx-redis.a
-  CMAKE_ARGS       ${CMLIB_EXT_PROJ_DEFAULT_ARGS})
+  CMAKE_ARGS       ${CMLIB_EXT_PROJ_DEFAULT_ARGS}
+                   <SOURCE_DIR>)
 if(MyxRedisThirdparty_FIND_COMPONENTS STREQUAL "headers")
   list(APPEND _ext_project_args
     BUILD_COMMAND     true
     INSTALL_COMMAND   ${CMAKE_MAKE_PROGRAM} myx-redis-install-headers)
 endif()
-ExternalProject_Add(${_ext_project_args} <SOURCE_DIR>)
+ExternalProject_Add(${_ext_project_args})
 unset(_ext_project_args)
 
 set(MYX_REDIS_IS_EXTERNAL_PROJECT ON CACHE BOOL "" FORCE)
diff --git a/FindPreprocThirdparty.cmake b/FindPreprocThirdparty.cmake
index 8fab6af..66f6bf9 100644
--- a/FindPreprocThirdparty.cmake
+++ b/FindPreprocThirdparty.cmake
@@ -9,13 +9,14 @@ list(APPEND _ext_project_args
   INSTALL_DIR      ${CMAKE_BINARY_DIR}
   BUILD_BYPRODUCTS ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}/libpreproc.a
   CMAKE_ARGS       ${CMLIB_EXT_PROJ_DEFAULT_ARGS}
-                   -DPREPROCMATH_PREFIX=${CMAKE_BINARY_DIR})
+                   -DPREPROCMATH_PREFIX=${CMAKE_BINARY_DIR}
+                   <SOURCE_DIR>)
 if(PreprocThirdparty_FIND_COMPONENTS STREQUAL "headers")
   list(APPEND _ext_project_args
     BUILD_COMMAND     true
     INSTALL_COMMAND   ${CMAKE_MAKE_PROGRAM} preproc-install-headers)
 endif()
-ExternalProject_Add(${_ext_project_args} <SOURCE_DIR>)
+ExternalProject_Add(${_ext_project_args})
 unset(_ext_project_args)
 
 set(PREPROC_IS_EXTERNAL_PROJECT ON CACHE BOOL "" FORCE)
diff --git a/FindPreprocmathThirdparty.cmake b/FindPreprocmathThirdparty.cmake
index 700ad9b..0f225f5 100644
--- a/FindPreprocmathThirdparty.cmake
+++ b/FindPreprocmathThirdparty.cmake
@@ -7,13 +7,14 @@ list(APPEND _ext_project_args
   SOURCE_DIR       ${CMAKE_SOURCE_DIR}/thirdparty/libpreprocmath
   INSTALL_DIR      ${CMAKE_BINARY_DIR}
   BUILD_BYPRODUCTS ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}/libpreprocmath.a
-  CMAKE_ARGS       ${CMLIB_EXT_PROJ_DEFAULT_ARGS})
+  CMAKE_ARGS       ${CMLIB_EXT_PROJ_DEFAULT_ARGS}
+                   <SOURCE_DIR>)
 if(PreprocmathThirdparty_FIND_COMPONENTS STREQUAL "headers")
   list(APPEND _ext_project_args
     BUILD_COMMAND     true
     INSTALL_COMMAND   ${CMAKE_MAKE_PROGRAM} preprocmath-install-headers)
 endif()
-ExternalProject_Add(${_ext_project_args} <SOURCE_DIR>)
+ExternalProject_Add(${_ext_project_args})
 unset(_ext_project_args)
 
 set(PREPROCMATH_IS_EXTERNAL_PROJECT ON CACHE BOOL "" FORCE)
diff --git a/FindSignalViewThirdparty.cmake b/FindSignalViewThirdparty.cmake
index 986c014..963e8ca 100644
--- a/FindSignalViewThirdparty.cmake
+++ b/FindSignalViewThirdparty.cmake
@@ -9,13 +9,14 @@ list(APPEND _ext_project_args
   INSTALL_DIR      ${CMAKE_BINARY_DIR}
   BUILD_BYPRODUCTS ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}/libsignalview.a
   CMAKE_ARGS       ${CMLIB_EXT_PROJ_DEFAULT_ARGS}
-                   -DPREPROCMATH_PREFIX=${CMAKE_BINARY_DIR})
+                   -DPREPROCMATH_PREFIX=${CMAKE_BINARY_DIR}
+                   <SOURCE_DIR>)
 if(SignalViewThirdparty_FIND_COMPONENTS STREQUAL "headers")
   list(APPEND _ext_project_args
     BUILD_COMMAND     true
     INSTALL_COMMAND   ${CMAKE_MAKE_PROGRAM} signalview-install-headers)
 endif()
-ExternalProject_Add(${_ext_project_args} <SOURCE_DIR>)
+ExternalProject_Add(${_ext_project_args})
 unset(_ext_project_args)
 
 set(SIGNALVIEW_IS_EXTERNAL_PROJECT ON CACHE BOOL "" FORCE)
diff --git a/FindVeerProtocolsThirdparty.cmake b/FindVeerProtocolsThirdparty.cmake
index 240eceb..07a8a30 100644
--- a/FindVeerProtocolsThirdparty.cmake
+++ b/FindVeerProtocolsThirdparty.cmake
@@ -6,13 +6,14 @@ list(APPEND _ext_project_args
   veer-protocols
   SOURCE_DIR  ${CMAKE_SOURCE_DIR}/thirdparty/veer-protocols
   INSTALL_DIR ${CMAKE_BINARY_DIR}
-  CMAKE_ARGS  ${CMLIB_EXT_PROJ_DEFAULT_ARGS})
+  CMAKE_ARGS  ${CMLIB_EXT_PROJ_DEFAULT_ARGS}
+              <SOURCE_DIR>)
 if(VeerProtocolsThirdparty_FIND_COMPONENTS STREQUAL "headers")
   list(APPEND _ext_project_args
     BUILD_COMMAND     true
     INSTALL_COMMAND   ${CMAKE_MAKE_PROGRAM} veer-protocols-install-headers)
 endif()
-ExternalProject_Add(${_ext_project_args} <SOURCE_DIR>)
+ExternalProject_Add(${_ext_project_args})
 unset(_ext_project_args)
 
 set(VEER_PROTOCOLS_IS_EXTERNAL_PROJECT ON CACHE BOOL "" FORCE)