diff --git a/FindCgalWidgetThirdparty.cmake b/FindCgalWidgetThirdparty.cmake
index c69f698..c2a2ef0 100644
--- a/FindCgalWidgetThirdparty.cmake
+++ b/FindCgalWidgetThirdparty.cmake
@@ -4,17 +4,16 @@ include(ExternalProject)
 # cmake-format: off
 list(APPEND _ext_project_args
   cgal-widget
-  SOURCE_DIR  ${CMAKE_SOURCE_DIR}/thirdparty/cgal-widget
-  INSTALL_DIR ${CMAKE_BINARY_DIR}
-  BYPRODUCTS  ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}/libcgal-widget.a
-  CMAKE_ARGS  ${CMLIB_EXT_PROJ_DEFAULT_ARGS}
-              <SOURCE_DIR>)
+  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})
 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})
+ExternalProject_Add(${_ext_project_args} <SOURCE_DIR>)
 unset(_ext_project_args)
 
 set(CGAL_WIDGET_IS_EXTERNAL_PROJECT ON CACHE BOOL "" FORCE)
diff --git a/FindFcProtocolThirdparty.cmake b/FindFcProtocolThirdparty.cmake
index 4d03ae3..cc81004 100644
--- a/FindFcProtocolThirdparty.cmake
+++ b/FindFcProtocolThirdparty.cmake
@@ -6,14 +6,13 @@ 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}
-              <SOURCE_DIR>)
+  CMAKE_ARGS  ${CMLIB_EXT_PROJ_DEFAULT_ARGS})
 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})
+ExternalProject_Add(${_ext_project_args} <SOURCE_DIR>)
 unset(_ext_project_args)
 
 set(FC_PROTOCOL_IS_EXTERNAL_PROJECT ON CACHE BOOL "" FORCE)
diff --git a/FindFspThirdparty.cmake b/FindFspThirdparty.cmake
index 6b6ae2c..957485c 100644
--- a/FindFspThirdparty.cmake
+++ b/FindFspThirdparty.cmake
@@ -5,20 +5,19 @@ include(ExternalProject)
 list(APPEND _ext_project_args
   libfsp
   DEPENDS libpreprocmath libionobase myxlib
-  SOURCE_DIR  ${CMAKE_SOURCE_DIR}/thirdparty/libfsp
-  INSTALL_DIR ${CMAKE_BINARY_DIR}
-  BYPRODUCTS  ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}/libfsp.a
-  CMAKE_ARGS  ${CMLIB_EXT_PROJ_DEFAULT_ARGS}
-              -DPREPROCMATH_PREFIX=${CMAKE_BINARY_DIR}
-              -DIONOBASE_PREFIX=${CMAKE_BINARY_DIR}
-              -DMYXLIB_PREFIX=${CMAKE_BINARY_DIR}
-              <SOURCE_DIR>)
+  SOURCE_DIR       ${CMAKE_SOURCE_DIR}/thirdparty/libfsp
+  INSTALL_DIR      ${CMAKE_BINARY_DIR}
+  BUILD_BYPRODUCTS ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}/libfsp.a
+  CMAKE_ARGS       ${CMLIB_EXT_PROJ_DEFAULT_ARGS}
+                   -DPREPROCMATH_PREFIX=${CMAKE_BINARY_DIR}
+                   -DIONOBASE_PREFIX=${CMAKE_BINARY_DIR}
+                   -DMYXLIB_PREFIX=${CMAKE_BINARY_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})
+ExternalProject_Add(${_ext_project_args} <SOURCE_DIR>)
 unset(_ext_project_args)
 
 set(FSP_IS_EXTERNAL_PROJECT ON CACHE BOOL "" FORCE)
diff --git a/FindIonobaseThirdparty.cmake b/FindIonobaseThirdparty.cmake
index 7fa9c83..6cf9f0b 100644
--- a/FindIonobaseThirdparty.cmake
+++ b/FindIonobaseThirdparty.cmake
@@ -4,17 +4,16 @@ include(ExternalProject)
 # cmake-format: off
 list(APPEND _ext_project_args
   libionobase
-  SOURCE_DIR  ${CMAKE_SOURCE_DIR}/thirdparty/libionobase
-  INSTALL_DIR ${CMAKE_BINARY_DIR}
-  BYPRODUCTS  ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}/libionobase.a
-  CMAKE_ARGS  ${CMLIB_EXT_PROJ_DEFAULT_ARGS}
-              <SOURCE_DIR>)
+  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})
 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})
+ExternalProject_Add(${_ext_project_args} <SOURCE_DIR>)
 unset(_ext_project_args)
 
 set(IONOBASE_IS_EXTERNAL_PROJECT ON CACHE BOOL "" FORCE)
diff --git a/FindMyxNotificationsThirdparty.cmake b/FindMyxNotificationsThirdparty.cmake
index bb0f13e..7de0e1b 100644
--- a/FindMyxNotificationsThirdparty.cmake
+++ b/FindMyxNotificationsThirdparty.cmake
@@ -4,17 +4,16 @@ include(ExternalProject)
 # cmake-format: off
 list(APPEND _ext_project_args
   myx-notifications
-  SOURCE_DIR  ${CMAKE_SOURCE_DIR}/thirdparty/myx-notifications
-  INSTALL_DIR ${CMAKE_BINARY_DIR}
-  BYPRODUCTS  ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}/libmyx-notifications.a
-  CMAKE_ARGS  ${CMLIB_EXT_PROJ_DEFAULT_ARGS}
-              <SOURCE_DIR>)
+  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})
 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})
+ExternalProject_Add(${_ext_project_args} <SOURCE_DIR>)
 unset(_ext_project_args)
 
 set(MYX_NOTIFICATIONS_IS_EXTERNAL_PROJECT ON CACHE BOOL "" FORCE)
diff --git a/FindMyxQPingThirdparty.cmake b/FindMyxQPingThirdparty.cmake
index 869c173..4d791a6 100644
--- a/FindMyxQPingThirdparty.cmake
+++ b/FindMyxQPingThirdparty.cmake
@@ -4,17 +4,16 @@ include(ExternalProject)
 # cmake-format: off
 list(APPEND _ext_project_args
   myx-qping
-  SOURCE_DIR  ${CMAKE_SOURCE_DIR}/thirdparty/myx-qping
-  INSTALL_DIR ${CMAKE_BINARY_DIR}
-  BYPRODUCTS  ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}/libmyx-qping.a
-  CMAKE_ARGS  ${CMLIB_EXT_PROJ_DEFAULT_ARGS}
-              <SOURCE_DIR>)
+  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})
 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})
+ExternalProject_Add(${_ext_project_args} <SOURCE_DIR>)
 unset(_ext_project_args)
 
 set(MYX_QPING_IS_EXTERNAL_PROJECT ON CACHE BOOL "" FORCE)
diff --git a/FindMyxRedisThirdparty.cmake b/FindMyxRedisThirdparty.cmake
index 2a0220c..1d15408 100644
--- a/FindMyxRedisThirdparty.cmake
+++ b/FindMyxRedisThirdparty.cmake
@@ -4,17 +4,16 @@ include(ExternalProject)
 # cmake-format: off
 list(APPEND _ext_project_args
   myx-redis
-  SOURCE_DIR  ${CMAKE_SOURCE_DIR}/thirdparty/myx-redis
-  INSTALL_DIR ${CMAKE_BINARY_DIR}
-  BYPRODUCTS  ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}/libmyx-redis.a
-  CMAKE_ARGS  ${CMLIB_EXT_PROJ_DEFAULT_ARGS}
-              <SOURCE_DIR>)
+  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})
 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})
+ExternalProject_Add(${_ext_project_args} <SOURCE_DIR>)
 unset(_ext_project_args)
 
 set(MYX_REDIS_IS_EXTERNAL_PROJECT ON CACHE BOOL "" FORCE)
diff --git a/FindMyxlibThirdparty.cmake b/FindMyxlibThirdparty.cmake
index 555ff98..9136853 100644
--- a/FindMyxlibThirdparty.cmake
+++ b/FindMyxlibThirdparty.cmake
@@ -4,18 +4,17 @@ include(ExternalProject)
 # cmake-format: off
 list(APPEND _ext_project_args
   myxlib
-  SOURCE_DIR  ${CMAKE_SOURCE_DIR}/thirdparty/myxlib
-  INSTALL_DIR ${CMAKE_BINARY_DIR}
-  BYPRODUCTS  ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}/libmyx-qt.a
-              ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}/libmyx-filesystem.a
-  CMAKE_ARGS  ${CMLIB_EXT_PROJ_DEFAULT_ARGS}
-              <SOURCE_DIR>)
+  SOURCE_DIR       ${CMAKE_SOURCE_DIR}/thirdparty/myxlib
+  INSTALL_DIR      ${CMAKE_BINARY_DIR}
+  BUILD_BYPRODUCTS ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}/libmyx-qt.a
+                   ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}/libmyx-filesystem.a
+  CMAKE_ARGS       ${CMLIB_EXT_PROJ_DEFAULT_ARGS})
 if(MyxlibThirdparty_FIND_COMPONENTS STREQUAL "headers")
   list(APPEND _ext_project_args
     BUILD_COMMAND     true
     INSTALL_COMMAND   ${CMAKE_MAKE_PROGRAM} myxlib-install-headers)
 endif()
-ExternalProject_Add(${_ext_project_args})
+ExternalProject_Add(${_ext_project_args} <SOURCE_DIR>)
 unset(_ext_project_args)
 
 set(MYXLIB_IS_EXTERNAL_PROJECT ON CACHE BOOL "" FORCE)
diff --git a/FindPreprocThirdparty.cmake b/FindPreprocThirdparty.cmake
index 19a7898..8fab6af 100644
--- a/FindPreprocThirdparty.cmake
+++ b/FindPreprocThirdparty.cmake
@@ -5,18 +5,17 @@ include(ExternalProject)
 list(APPEND _ext_project_args
   libpreproc
   DEPENDS libpreprocmath
-  SOURCE_DIR  ${CMAKE_SOURCE_DIR}/thirdparty/libpreproc
-  INSTALL_DIR ${CMAKE_BINARY_DIR}
-  BYPRODUCTS  ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}/libpreproc.a
-  CMAKE_ARGS  ${CMLIB_EXT_PROJ_DEFAULT_ARGS}
-              -DPREPROCMATH_PREFIX=${CMAKE_BINARY_DIR}
-              <SOURCE_DIR>)
+  SOURCE_DIR       ${CMAKE_SOURCE_DIR}/thirdparty/libpreproc
+  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})
 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})
+ExternalProject_Add(${_ext_project_args} <SOURCE_DIR>)
 unset(_ext_project_args)
 
 set(PREPROC_IS_EXTERNAL_PROJECT ON CACHE BOOL "" FORCE)
diff --git a/FindPreprocmathThirdparty.cmake b/FindPreprocmathThirdparty.cmake
index ab359dd..700ad9b 100644
--- a/FindPreprocmathThirdparty.cmake
+++ b/FindPreprocmathThirdparty.cmake
@@ -4,17 +4,16 @@ include(ExternalProject)
 # cmake-format: off
 list(APPEND _ext_project_args
   libpreprocmath
-  SOURCE_DIR  ${CMAKE_SOURCE_DIR}/thirdparty/libpreprocmath
-  INSTALL_DIR ${CMAKE_BINARY_DIR}
-  BYPRODUCTS  ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}/libpreprocmath.a
-  CMAKE_ARGS  ${CMLIB_EXT_PROJ_DEFAULT_ARGS}
-              <SOURCE_DIR>)
+  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})
 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})
+ExternalProject_Add(${_ext_project_args} <SOURCE_DIR>)
 unset(_ext_project_args)
 
 set(PREPROCMATH_IS_EXTERNAL_PROJECT ON CACHE BOOL "" FORCE)
diff --git a/FindSignalViewThirdparty.cmake b/FindSignalViewThirdparty.cmake
index d90bba0..986c014 100644
--- a/FindSignalViewThirdparty.cmake
+++ b/FindSignalViewThirdparty.cmake
@@ -5,18 +5,17 @@ include(ExternalProject)
 list(APPEND _ext_project_args
   libsignalview
   DEPENDS libpreprocmath
-  SOURCE_DIR  ${CMAKE_SOURCE_DIR}/thirdparty/libsignalview
-  INSTALL_DIR ${CMAKE_BINARY_DIR}
-  BYPRODUCTS  ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}/libsignalview.a
-  CMAKE_ARGS  ${CMLIB_EXT_PROJ_DEFAULT_ARGS}
-              -DPREPROCMATH_PREFIX=${CMAKE_BINARY_DIR}
-              <SOURCE_DIR>)
+  SOURCE_DIR       ${CMAKE_SOURCE_DIR}/thirdparty/libsignalview
+  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})
 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})
+ExternalProject_Add(${_ext_project_args} <SOURCE_DIR>)
 unset(_ext_project_args)
 
 set(SIGNALVIEW_IS_EXTERNAL_PROJECT ON CACHE BOOL "" FORCE)
diff --git a/FindVeerProtocolsThirdparty.cmake b/FindVeerProtocolsThirdparty.cmake
index 07a8a30..240eceb 100644
--- a/FindVeerProtocolsThirdparty.cmake
+++ b/FindVeerProtocolsThirdparty.cmake
@@ -6,14 +6,13 @@ 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}
-              <SOURCE_DIR>)
+  CMAKE_ARGS  ${CMLIB_EXT_PROJ_DEFAULT_ARGS})
 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})
+ExternalProject_Add(${_ext_project_args} <SOURCE_DIR>)
 unset(_ext_project_args)
 
 set(VEER_PROTOCOLS_IS_EXTERNAL_PROJECT ON CACHE BOOL "" FORCE)