Порядок аргументов

2021-07-05 10:54:13 +03:00 · 2021-07-05 10:54:13 +03:00 · 397c6d2b1b
commit 397c6d2b1b
parent beb7bfa001
12 changed files with 60 additions and 72 deletions
--- a/FindCgalWidgetThirdparty.cmake
+++ b/FindCgalWidgetThirdparty.cmake
@ -6,15 +6,14 @@ 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>)
+  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)
--- 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)
--- a/FindFspThirdparty.cmake
+++ b/FindFspThirdparty.cmake
@ -7,18 +7,17 @@ list(APPEND _ext_project_args
  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
+  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}
-              <SOURCE_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)
--- a/FindIonobaseThirdparty.cmake
+++ b/FindIonobaseThirdparty.cmake
@ -6,15 +6,14 @@ 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>)
+  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)
--- a/FindMyxNotificationsThirdparty.cmake
+++ b/FindMyxNotificationsThirdparty.cmake
@ -6,15 +6,14 @@ 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>)
+  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)
--- a/FindMyxQPingThirdparty.cmake
+++ b/FindMyxQPingThirdparty.cmake
@ -6,15 +6,14 @@ 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>)
+  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)
--- a/FindMyxRedisThirdparty.cmake
+++ b/FindMyxRedisThirdparty.cmake
@ -6,15 +6,14 @@ 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>)
+  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)
--- a/FindMyxlibThirdparty.cmake
+++ b/FindMyxlibThirdparty.cmake
@ -6,16 +6,15 @@ 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
+  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}
-              <SOURCE_DIR>)
+  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)
--- a/FindPreprocThirdparty.cmake
+++ b/FindPreprocThirdparty.cmake
@ -7,16 +7,15 @@ list(APPEND _ext_project_args
  DEPENDS libpreprocmath
  SOURCE_DIR       ${CMAKE_SOURCE_DIR}/thirdparty/libpreproc
  INSTALL_DIR      ${CMAKE_BINARY_DIR}
-  BYPRODUCTS  ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}/libpreproc.a
+  BUILD_BYPRODUCTS ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}/libpreproc.a
  CMAKE_ARGS       ${CMLIB_EXT_PROJ_DEFAULT_ARGS}
-              -DPREPROCMATH_PREFIX=${CMAKE_BINARY_DIR}
-              <SOURCE_DIR>)
+                   -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)
--- a/FindPreprocmathThirdparty.cmake
+++ b/FindPreprocmathThirdparty.cmake
@ -6,15 +6,14 @@ 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>)
+  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)
--- a/FindSignalViewThirdparty.cmake
+++ b/FindSignalViewThirdparty.cmake
@ -7,16 +7,15 @@ list(APPEND _ext_project_args
  DEPENDS libpreprocmath
  SOURCE_DIR       ${CMAKE_SOURCE_DIR}/thirdparty/libsignalview
  INSTALL_DIR      ${CMAKE_BINARY_DIR}
-  BYPRODUCTS  ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}/libsignalview.a
+  BUILD_BYPRODUCTS ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}/libsignalview.a
  CMAKE_ARGS       ${CMLIB_EXT_PROJ_DEFAULT_ARGS}
-              -DPREPROCMATH_PREFIX=${CMAKE_BINARY_DIR}
-              <SOURCE_DIR>)
+                   -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)
--- 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)