Обновлены скрипты для подключения подпроектов

2021-07-03 09:43:29 +03:00
parent 29faeeae1a
commit 465ad38cb8
13 changed files with 65 additions and 92 deletions
--- a/FindCgalWidgetThirdparty.cmake
+++ b/FindCgalWidgetThirdparty.cmake
@@ -6,11 +6,9 @@ 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>)
-
+  BYPRODUCTS  <INSTALL_DIR>/${CMAKE_INSTALL_LIBDIR}/libcgal-widget.a
+  CMAKE_ARGS  ${CMLIB_EXT_PROJ_DEFAULT_ARGS}
+              <SOURCE_DIR>)
 if(CgalWidgetThirdparty_FIND_COMPONENTS STREQUAL "headers")
  list(APPEND _ext_project_args
    BUILD_COMMAND     true
--- a/FindFcProtocolThirdparty.cmake
+++ b/FindFcProtocolThirdparty.cmake
@@ -6,12 +6,8 @@ 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}
+  CMAKE_ARGS  ${CMLIB_EXT_PROJ_DEFAULT_ARGS}
              <SOURCE_DIR>)
-
 if(FcProtocolThirdparty_FIND_COMPONENTS STREQUAL "headers")
  list(APPEND _ext_project_args
    BUILD_COMMAND     true
--- a/FindFspThirdparty.cmake
+++ b/FindFspThirdparty.cmake
@@ -7,13 +7,12 @@ list(APPEND _ext_project_args
  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}"
+  BYPRODUCTS  <INSTALL_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}
-                         -DCMLIB_MAIN_DIR=${CMLIB_MAIN_DIR}
-                         ${CMLIB_EXT_PROJ_DEFAULT_ARGS} <SOURCE_DIR>)
+              <SOURCE_DIR>)
 if(FspThirdparty_FIND_COMPONENTS STREQUAL "headers")
  list(APPEND _ext_project_args
    BUILD_COMMAND     true
--- a/FindIonobaseThirdparty.cmake
+++ b/FindIonobaseThirdparty.cmake
@@ -6,12 +6,9 @@ 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}
+  BYPRODUCTS  <INSTALL_DIR>/${CMAKE_INSTALL_LIBDIR}/libionobase.a
+  CMAKE_ARGS  ${CMLIB_EXT_PROJ_DEFAULT_ARGS}
              <SOURCE_DIR>)
-
 if(IonobaseThirdparty_FIND_COMPONENTS STREQUAL "headers")
  list(APPEND _ext_project_args
    BUILD_COMMAND     true
--- a/FindMPFRCppThirdparty.cmake
+++ b/FindMPFRCppThirdparty.cmake
@@ -6,8 +6,7 @@ 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>)
 endif()
--- a/FindMyxNotificationsThirdparty.cmake
+++ b/FindMyxNotificationsThirdparty.cmake
@@ -6,10 +6,8 @@ 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}
+  BYPRODUCTS  <INSTALL_DIR>/${CMAKE_INSTALL_LIBDIR}/libmyx-notifications.a
+  CMAKE_ARGS  ${CMLIB_EXT_PROJ_DEFAULT_ARGS}
              <SOURCE_DIR>)
 if(MyxNotificationsThirdparty_FIND_COMPONENTS STREQUAL "headers")
  list(APPEND _ext_project_args
--- a/FindMyxQPingThirdparty.cmake
+++ b/FindMyxQPingThirdparty.cmake
@@ -6,12 +6,9 @@ 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}
+  BYPRODUCTS  <INSTALL_DIR>/${CMAKE_INSTALL_LIBDIR}/libmyx-qping.a
+  CMAKE_ARGS  ${CMLIB_EXT_PROJ_DEFAULT_ARGS}
              <SOURCE_DIR>)
-
 if(MyxQPingThirdparty_FIND_COMPONENTS STREQUAL "headers")
  list(APPEND _ext_project_args
    BUILD_COMMAND     true
--- a/FindMyxRedisThirdparty.cmake
+++ b/FindMyxRedisThirdparty.cmake
@@ -6,10 +6,8 @@ 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}
+  BYPRODUCTS  <INSTALL_DIR>/${CMAKE_INSTALL_LIBDIR}/libmyx-redis.a
+  CMAKE_ARGS  ${CMLIB_EXT_PROJ_DEFAULT_ARGS}
              <SOURCE_DIR>)
 if(MyxRedisThirdparty_FIND_COMPONENTS STREQUAL "headers")
  list(APPEND _ext_project_args
--- a/FindMyxlibThirdparty.cmake
+++ b/FindMyxlibThirdparty.cmake
@@ -6,12 +6,10 @@ 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}
+  BYPRODUCTS  <INSTALL_DIR>/${CMAKE_INSTALL_LIBDIR}/libmyx-qt.a
+              <INSTALL_DIR>/${CMAKE_INSTALL_LIBDIR}/libmyx-filesystem.a
+  CMAKE_ARGS  ${CMLIB_EXT_PROJ_DEFAULT_ARGS}
              <SOURCE_DIR>)
-
 if(MyxlibThirdparty_FIND_COMPONENTS STREQUAL "headers")
  list(APPEND _ext_project_args
    BUILD_COMMAND     true
--- a/FindPreprocThirdparty.cmake
+++ b/FindPreprocThirdparty.cmake
@@ -7,11 +7,10 @@ list(APPEND _ext_project_args
  DEPENDS libpreprocmath
  SOURCE_DIR  ${CMAKE_SOURCE_DIR}/thirdparty/libpreproc
  INSTALL_DIR ${CMAKE_BINARY_DIR}
-  DOWNLOAD_COMMAND    ""
-  CONFIGURE_COMMAND   ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}"
+  BYPRODUCTS  <INSTALL_DIR>/${CMAKE_INSTALL_LIBDIR}/libpreproc.a
+  CMAKE_ARGS  ${CMLIB_EXT_PROJ_DEFAULT_ARGS}
              -DPREPROCMATH_PREFIX=${CMAKE_BINARY_DIR}
-                         -DCMLIB_MAIN_DIR=${CMLIB_MAIN_DIR}
-                         ${CMLIB_EXT_PROJ_DEFAULT_ARGS} <SOURCE_DIR>)
+              <SOURCE_DIR>)
 if(PreprocThirdparty_FIND_COMPONENTS STREQUAL "headers")
  list(APPEND _ext_project_args
    BUILD_COMMAND     true
--- a/FindPreprocmathThirdparty.cmake
+++ b/FindPreprocmathThirdparty.cmake
@@ -6,10 +6,9 @@ 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>)
+  BYPRODUCTS  <INSTALL_DIR>/${CMAKE_INSTALL_LIBDIR}/libpreprocmath.a
+  CMAKE_ARGS  ${CMLIB_EXT_PROJ_DEFAULT_ARGS}
+              <SOURCE_DIR>)
 if(PreprocmathThirdparty_FIND_COMPONENTS STREQUAL "headers")
  list(APPEND _ext_project_args
    BUILD_COMMAND     true
--- a/FindSignalViewThirdparty.cmake
+++ b/FindSignalViewThirdparty.cmake
@@ -7,11 +7,10 @@ list(APPEND _ext_project_args
  DEPENDS libpreprocmath
  SOURCE_DIR  ${CMAKE_SOURCE_DIR}/thirdparty/libsignalview
  INSTALL_DIR ${CMAKE_BINARY_DIR}
-  DOWNLOAD_COMMAND    ""
-  CONFIGURE_COMMAND   ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}"
+  BYPRODUCTS  <INSTALL_DIR>/${CMAKE_INSTALL_LIBDIR}/libsignalview.a
+  CMAKE_ARGS  ${CMLIB_EXT_PROJ_DEFAULT_ARGS}
              -DPREPROCMATH_PREFIX=${CMAKE_BINARY_DIR}
-                         -DCMLIB_MAIN_DIR=${CMLIB_MAIN_DIR}
-                         ${CMLIB_EXT_PROJ_DEFAULT_ARGS} <SOURCE_DIR>)
+              <SOURCE_DIR>)
 if(SignalViewThirdparty_FIND_COMPONENTS STREQUAL "headers")
  list(APPEND _ext_project_args
    BUILD_COMMAND     true
--- a/FindVeerProtocolsThirdparty.cmake
+++ b/FindVeerProtocolsThirdparty.cmake
@@ -6,12 +6,8 @@ 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}
+  CMAKE_ARGS  ${CMLIB_EXT_PROJ_DEFAULT_ARGS}
              <SOURCE_DIR>)
-
 if(VeerProtocolsThirdparty_FIND_COMPONENTS STREQUAL "headers")
  list(APPEND _ext_project_args
    BUILD_COMMAND     true