From 465ad38cb84914672c96276a665f8d78438575c1 Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Sat, 3 Jul 2021 09:43:29 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D1=8B=20=D1=81=D0=BA=D1=80=D0=B8=D0=BF=D1=82=D1=8B=20?= =?UTF-8?q?=D0=B4=D0=BB=D1=8F=20=D0=BF=D0=BE=D0=B4=D0=BA=D0=BB=D1=8E=D1=87?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=BF=D0=BE=D0=B4=D0=BF=D1=80=D0=BE?= =?UTF-8?q?=D0=B5=D0=BA=D1=82=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- FindCgalWidgetThirdparty.cmake | 12 +++++------- FindFcProtocolThirdparty.cmake | 12 ++++-------- FindFspThirdparty.cmake | 17 ++++++++--------- FindIonobaseThirdparty.cmake | 13 +++++-------- FindMPFRCppThirdparty.cmake | 3 +-- FindMyxNotificationsThirdparty.cmake | 12 +++++------- FindMyxQPingThirdparty.cmake | 13 +++++-------- FindMyxRedisThirdparty.cmake | 12 +++++------- FindMyxlibThirdparty.cmake | 14 ++++++-------- FindPreprocThirdparty.cmake | 13 ++++++------- FindPreprocmathThirdparty.cmake | 11 +++++------ FindSignalViewThirdparty.cmake | 13 ++++++------- FindVeerProtocolsThirdparty.cmake | 12 ++++-------- 13 files changed, 65 insertions(+), 92 deletions(-) diff --git a/FindCgalWidgetThirdparty.cmake b/FindCgalWidgetThirdparty.cmake index 3639169..8e2981e 100644 --- a/FindCgalWidgetThirdparty.cmake +++ b/FindCgalWidgetThirdparty.cmake @@ -4,13 +4,11 @@ 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 ${CMAKE_SOURCE_DIR}/thirdparty/cgal-widget + INSTALL_DIR ${CMAKE_BINARY_DIR} + BYPRODUCTS /${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 diff --git a/FindFcProtocolThirdparty.cmake b/FindFcProtocolThirdparty.cmake index 4a81c5e..4d03ae3 100644 --- a/FindFcProtocolThirdparty.cmake +++ b/FindFcProtocolThirdparty.cmake @@ -4,14 +4,10 @@ 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 ${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 diff --git a/FindFspThirdparty.cmake b/FindFspThirdparty.cmake index 451bc22..7a3d2a9 100644 --- a/FindFspThirdparty.cmake +++ b/FindFspThirdparty.cmake @@ -5,15 +5,14 @@ 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 ${CMAKE_SOURCE_DIR}/thirdparty/libfsp + INSTALL_DIR ${CMAKE_BINARY_DIR} + BYPRODUCTS /${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 diff --git a/FindIonobaseThirdparty.cmake b/FindIonobaseThirdparty.cmake index 88de228..0d79ca7 100644 --- a/FindIonobaseThirdparty.cmake +++ b/FindIonobaseThirdparty.cmake @@ -4,14 +4,11 @@ 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 ${CMAKE_SOURCE_DIR}/thirdparty/libionobase + INSTALL_DIR ${CMAKE_BINARY_DIR} + BYPRODUCTS /${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 diff --git a/FindMPFRCppThirdparty.cmake b/FindMPFRCppThirdparty.cmake index 0b14e38..1797d17 100644 --- 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 /mpreal.h ) endif() diff --git a/FindMyxNotificationsThirdparty.cmake b/FindMyxNotificationsThirdparty.cmake index dd62b61..2e75240 100644 --- a/FindMyxNotificationsThirdparty.cmake +++ b/FindMyxNotificationsThirdparty.cmake @@ -4,13 +4,11 @@ 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 ${CMAKE_SOURCE_DIR}/thirdparty/myx-notifications + INSTALL_DIR ${CMAKE_BINARY_DIR} + BYPRODUCTS /${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 diff --git a/FindMyxQPingThirdparty.cmake b/FindMyxQPingThirdparty.cmake index 5af6e77..db4f61b 100644 --- a/FindMyxQPingThirdparty.cmake +++ b/FindMyxQPingThirdparty.cmake @@ -4,14 +4,11 @@ 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 ${CMAKE_SOURCE_DIR}/thirdparty/myx-qping + INSTALL_DIR ${CMAKE_BINARY_DIR} + BYPRODUCTS /${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 diff --git a/FindMyxRedisThirdparty.cmake b/FindMyxRedisThirdparty.cmake index 92ff9ff..c49c8a1 100644 --- a/FindMyxRedisThirdparty.cmake +++ b/FindMyxRedisThirdparty.cmake @@ -4,13 +4,11 @@ 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 ${CMAKE_SOURCE_DIR}/thirdparty/myx-redis + INSTALL_DIR ${CMAKE_BINARY_DIR} + BYPRODUCTS /${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 diff --git a/FindMyxlibThirdparty.cmake b/FindMyxlibThirdparty.cmake index 2be305e..c5a5771 100644 --- a/FindMyxlibThirdparty.cmake +++ b/FindMyxlibThirdparty.cmake @@ -4,14 +4,12 @@ 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 ${CMAKE_SOURCE_DIR}/thirdparty/myxlib + INSTALL_DIR ${CMAKE_BINARY_DIR} + BYPRODUCTS /${CMAKE_INSTALL_LIBDIR}/libmyx-qt.a + /${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 diff --git a/FindPreprocThirdparty.cmake b/FindPreprocThirdparty.cmake index 1b87cbf..db5bd91 100644 --- a/FindPreprocThirdparty.cmake +++ b/FindPreprocThirdparty.cmake @@ -5,13 +5,12 @@ 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 ${CMAKE_SOURCE_DIR}/thirdparty/libpreproc + INSTALL_DIR ${CMAKE_BINARY_DIR} + BYPRODUCTS /${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 diff --git a/FindPreprocmathThirdparty.cmake b/FindPreprocmathThirdparty.cmake index 4829e65..72bb126 100644 --- a/FindPreprocmathThirdparty.cmake +++ b/FindPreprocmathThirdparty.cmake @@ -4,12 +4,11 @@ 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 ${CMAKE_SOURCE_DIR}/thirdparty/libpreprocmath + INSTALL_DIR ${CMAKE_BINARY_DIR} + BYPRODUCTS /${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 diff --git a/FindSignalViewThirdparty.cmake b/FindSignalViewThirdparty.cmake index b9ce1b2..acd8f67 100644 --- a/FindSignalViewThirdparty.cmake +++ b/FindSignalViewThirdparty.cmake @@ -5,13 +5,12 @@ 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 ${CMAKE_SOURCE_DIR}/thirdparty/libsignalview + INSTALL_DIR ${CMAKE_BINARY_DIR} + BYPRODUCTS /${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 diff --git a/FindVeerProtocolsThirdparty.cmake b/FindVeerProtocolsThirdparty.cmake index 4b8742f..07a8a30 100644 --- a/FindVeerProtocolsThirdparty.cmake +++ b/FindVeerProtocolsThirdparty.cmake @@ -4,14 +4,10 @@ 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 ${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