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

Замена <INSTALL_DIR> на ${CMAKE_BINARY_DIR}
Обновлены скрипты для подключения подпроектов
2021-07-05 10:54:13 +03:00 · 2021-07-05 10:35:15 +03:00 · 2021-07-03 09:43:29 +03:00
13 changed files with 66 additions and 105 deletions
--- a/FindCgalWidgetThirdparty.cmake
+++ b/FindCgalWidgetThirdparty.cmake
@@ -4,19 +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}
-  DOWNLOAD_COMMAND    ""
-  CONFIGURE_COMMAND   ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}"
-                         -DCMLIB_MAIN_DIR=${CMLIB_MAIN_DIR}
-                         ${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)
--- a/FindFcProtocolThirdparty.cmake
+++ b/FindFcProtocolThirdparty.cmake
@@ -4,20 +4,15 @@ include(ExternalProject)
 # cmake-format: off
 list(APPEND _ext_project_args
  fc-protocol
-  SOURCE_DIR          ${CMAKE_SOURCE_DIR}/thirdparty/fc-protocol
-  INSTALL_DIR         ${CMAKE_BINARY_DIR}
-  DOWNLOAD_COMMAND    ""
-  CONFIGURE_COMMAND   ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}"
-                         -DCMLIB_MAIN_DIR=${CMLIB_MAIN_DIR}
-                         ${CMLIB_EXT_PROJ_DEFAULT_ARGS}
-                      <SOURCE_DIR>)
-
+  SOURCE_DIR  ${CMAKE_SOURCE_DIR}/thirdparty/fc-protocol
+  INSTALL_DIR ${CMAKE_BINARY_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
@@ -5,21 +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}
-  DOWNLOAD_COMMAND    ""
-  CONFIGURE_COMMAND   ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}"
-                         -DPREPROCMATH_PREFIX=${CMAKE_BINARY_DIR}
-                         -DIONOBASE_PREFIX=${CMAKE_BINARY_DIR}
-                         -DMYXLIB_PREFIX=${CMAKE_BINARY_DIR}
-                         -DCMLIB_MAIN_DIR=${CMLIB_MAIN_DIR}
-                         ${CMLIB_EXT_PROJ_DEFAULT_ARGS} <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)
--- a/FindIonobaseThirdparty.cmake
+++ b/FindIonobaseThirdparty.cmake
@@ -4,20 +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}
-  DOWNLOAD_COMMAND    ""
-  CONFIGURE_COMMAND   ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}"
-                      -DCMLIB_MAIN_DIR=${CMLIB_MAIN_DIR}
-                      ${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)
--- a/FindMPFRCppThirdparty.cmake
+++ b/FindMPFRCppThirdparty.cmake
@@ -6,10 +6,9 @@ if(MPFR_FOUND)
    mpfrcpp
    SOURCE_DIR ${CMAKE_SOURCE_DIR}/thirdparty/mpreal
    INSTALL_DIR ${CMAKE_BINARY_DIR}/include
-    DOWNLOAD_COMMAND ""
-    CONFIGURE_COMMAND ""
+    CONFIGURE_COMMAND true
    BUILD_COMMAND true
-    INSTALL_COMMAND ${CMAKE_COMMAND} -E copy <SOURCE_DIR>/mpreal.h <INSTALL_DIR>)
+    INSTALL_COMMAND ${CMAKE_COMMAND} -E copy <SOURCE_DIR>/mpreal.h ${CMAKE_BINARY_DIR})
 endif()

 set(MPFRCPP_PREFIX  ${CMAKE_BINARY_DIR} CACHE FILEPATH "" FORCE)
--- a/FindMyxNotificationsThirdparty.cmake
+++ b/FindMyxNotificationsThirdparty.cmake
@@ -4,19 +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}
-  DOWNLOAD_COMMAND    ""
-  CONFIGURE_COMMAND   ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}"
-                         -DCMLIB_MAIN_DIR=${CMLIB_MAIN_DIR}
-                         ${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)
--- a/FindMyxQPingThirdparty.cmake
+++ b/FindMyxQPingThirdparty.cmake
@@ -4,20 +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}
-  DOWNLOAD_COMMAND    ""
-  CONFIGURE_COMMAND   ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}"
-                         -DCMLIB_MAIN_DIR=${CMLIB_MAIN_DIR}
-                         ${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)
--- a/FindMyxRedisThirdparty.cmake
+++ b/FindMyxRedisThirdparty.cmake
@@ -4,19 +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}
-  DOWNLOAD_COMMAND    ""
-  CONFIGURE_COMMAND   ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}"
-                         -DCMLIB_MAIN_DIR=${CMLIB_MAIN_DIR}
-                         ${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)
--- a/FindMyxlibThirdparty.cmake
+++ b/FindMyxlibThirdparty.cmake
@@ -4,20 +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}
-  DOWNLOAD_COMMAND    ""
-  CONFIGURE_COMMAND   ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}"
-                         -DCMLIB_MAIN_DIR=${CMLIB_MAIN_DIR}
-                         ${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)
--- a/FindPreprocThirdparty.cmake
+++ b/FindPreprocThirdparty.cmake
@@ -5,19 +5,17 @@ include(ExternalProject)
 list(APPEND _ext_project_args
  libpreproc
  DEPENDS libpreprocmath
-  SOURCE_DIR          ${CMAKE_SOURCE_DIR}/thirdparty/libpreproc
-  INSTALL_DIR         ${CMAKE_BINARY_DIR}
-  DOWNLOAD_COMMAND    ""
-  CONFIGURE_COMMAND   ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}"
-                         -DPREPROCMATH_PREFIX=${CMAKE_BINARY_DIR}
-                         -DCMLIB_MAIN_DIR=${CMLIB_MAIN_DIR}
-                         ${CMLIB_EXT_PROJ_DEFAULT_ARGS} <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)
--- a/FindPreprocmathThirdparty.cmake
+++ b/FindPreprocmathThirdparty.cmake
@@ -4,18 +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}
-  DOWNLOAD_COMMAND    ""
-  CONFIGURE_COMMAND   ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}"
-                         -DCMLIB_MAIN_DIR=${CMLIB_MAIN_DIR}
-                         ${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)
--- a/FindSignalViewThirdparty.cmake
+++ b/FindSignalViewThirdparty.cmake
@@ -5,19 +5,17 @@ include(ExternalProject)
 list(APPEND _ext_project_args
  libsignalview
  DEPENDS libpreprocmath
-  SOURCE_DIR          ${CMAKE_SOURCE_DIR}/thirdparty/libsignalview
-  INSTALL_DIR         ${CMAKE_BINARY_DIR}
-  DOWNLOAD_COMMAND    ""
-  CONFIGURE_COMMAND   ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}"
-                         -DPREPROCMATH_PREFIX=${CMAKE_BINARY_DIR}
-                         -DCMLIB_MAIN_DIR=${CMLIB_MAIN_DIR}
-                         ${CMLIB_EXT_PROJ_DEFAULT_ARGS} <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)
--- a/FindVeerProtocolsThirdparty.cmake
+++ b/FindVeerProtocolsThirdparty.cmake
@@ -4,20 +4,15 @@ include(ExternalProject)
 # cmake-format: off
 list(APPEND _ext_project_args
  veer-protocols
-  SOURCE_DIR          ${CMAKE_SOURCE_DIR}/thirdparty/veer-protocols
-  INSTALL_DIR         ${CMAKE_BINARY_DIR}
-  DOWNLOAD_COMMAND    ""
-  CONFIGURE_COMMAND   ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}"
-                         -DCMLIB_MAIN_DIR=${CMLIB_MAIN_DIR}
-                         ${CMLIB_EXT_PROJ_DEFAULT_ARGS}
-                      <SOURCE_DIR>)
-
+  SOURCE_DIR  ${CMAKE_SOURCE_DIR}/thirdparty/veer-protocols
+  INSTALL_DIR ${CMAKE_BINARY_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)
Author	SHA1	Message	Date
Andrey Astafyev	397c6d2b1b	Порядок аргументов	2021-07-05 10:54:13 +03:00
Andrey Astafyev	beb7bfa001	Замена <INSTALL_DIR> на ${CMAKE_BINARY_DIR}	2021-07-05 10:35:15 +03:00
Andrey Astafyev	465ad38cb8	Обновлены скрипты для подключения подпроектов	2021-07-03 09:43:29 +03:00