From 6a8dab968cc57317fed6048ecefef5fd58c34cb0 Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Mon, 2 Aug 2021 17:59:39 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D1=80=D0=B0=D0=B2=D0=BA=D0=B0=20thirdpar?= =?UTF-8?q?ty?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- FindCgalWidgetThirdparty.cmake | 40 ++++++++++++----------- FindFcProtocolThirdparty.cmake | 20 ++++++------ FindFspThirdparty.cmake | 48 +++++++++++++++------------- FindImitatorThirdparty.cmake | 9 +++--- FindIonobaseThirdparty.cmake | 40 ++++++++++++----------- FindMyxNotificationsThirdparty.cmake | 42 ++++++++++++------------ FindMyxQPingThirdparty.cmake | 40 ++++++++++++----------- FindMyxRedisThirdparty.cmake | 40 ++++++++++++----------- FindMyxlibThirdparty.cmake | 43 ++++++++++++------------- FindPreprocThirdparty.cmake | 44 +++++++++++++------------ FindPreprocmathThirdparty.cmake | 40 ++++++++++++----------- FindSignalViewThirdparty.cmake | 44 +++++++++++++------------ 12 files changed, 233 insertions(+), 217 deletions(-) diff --git a/FindCgalWidgetThirdparty.cmake b/FindCgalWidgetThirdparty.cmake index 6400b72..b4a669e 100644 --- a/FindCgalWidgetThirdparty.cmake +++ b/FindCgalWidgetThirdparty.cmake @@ -1,25 +1,6 @@ # Подключение внешних проектов 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} - 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}) -unset(_ext_project_args) - -set(CGAL_WIDGET_IS_EXTERNAL_PROJECT ON CACHE BOOL "" FORCE) -# cmake-format: on - set(CGAL_WIDGET_PREFIX ${CMAKE_BINARY_DIR} CACHE FILEPATH "" FORCE) @@ -35,3 +16,24 @@ set(CGAL_WIDGET_LIBRARY_DIR set(CGAL_WIDGET_LIBRARIES ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}/libcgal-widget.a CACHE FILEPATH "" FORCE) + +# cmake-format: off +list(APPEND _ext_project_args + cgal-widget + SOURCE_DIR ${CMAKE_SOURCE_DIR}/thirdparty/cgal-widget + INSTALL_DIR ${CMAKE_BINARY_DIR} + 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) +else() + list(APPEND _ext_project_args + BUILD_BYPRODUCTS ${CGAL_WIDGET_LIBRARIES}) +endif() +ExternalProject_Add(${_ext_project_args}) +unset(_ext_project_args) + +set(CGAL_WIDGET_IS_EXTERNAL_PROJECT ON CACHE BOOL "" FORCE) +# cmake-format: on diff --git a/FindFcProtocolThirdparty.cmake b/FindFcProtocolThirdparty.cmake index 4d03ae3..58af740 100644 --- a/FindFcProtocolThirdparty.cmake +++ b/FindFcProtocolThirdparty.cmake @@ -1,6 +1,16 @@ # Подключение внешних проектов include(ExternalProject) +set(FC_PROTOCOL_PREFIX + ${CMAKE_BINARY_DIR} + CACHE FILEPATH "" FORCE) +set(FC_PROTOCOL_INCLUDE_DIR + ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_INCLUDEDIR} + CACHE PATH "" FORCE) +set(FC_PROTOCOL_INCLUDE_DIRS + ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_INCLUDEDIR} + CACHE PATH "" FORCE) + # cmake-format: off list(APPEND _ext_project_args fc-protocol @@ -18,13 +28,3 @@ unset(_ext_project_args) set(FC_PROTOCOL_IS_EXTERNAL_PROJECT ON CACHE BOOL "" FORCE) # cmake-format: on - -set(FC_PROTOCOL_PREFIX - ${CMAKE_BINARY_DIR} - CACHE FILEPATH "" FORCE) -set(FC_PROTOCOL_INCLUDE_DIR - ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_INCLUDEDIR} - CACHE PATH "" FORCE) -set(FC_PROTOCOL_INCLUDE_DIRS - ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_INCLUDEDIR} - CACHE PATH "" FORCE) diff --git a/FindFspThirdparty.cmake b/FindFspThirdparty.cmake index d61066f..8e5b5b1 100644 --- a/FindFspThirdparty.cmake +++ b/FindFspThirdparty.cmake @@ -1,29 +1,6 @@ # Подключение внешних проектов include(ExternalProject) -# cmake-format: off -list(APPEND _ext_project_args - libfsp - DEPENDS libpreprocmath libionobase myxlib - 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}) -unset(_ext_project_args) - -set(FSP_IS_EXTERNAL_PROJECT ON CACHE BOOL "" FORCE) -# cmake-format: on - set(FSP_PREFIX ${CMAKE_BINARY_DIR} CACHE FILEPATH "" FORCE) @@ -39,3 +16,28 @@ set(FSP_LIBRARY_DIR set(FSP_LIBRARIES ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}/libfsp.a CACHE FILEPATH "" FORCE) + +# cmake-format: off +list(APPEND _ext_project_args + libfsp + DEPENDS libpreprocmath libionobase myxlib + SOURCE_DIR ${CMAKE_SOURCE_DIR}/thirdparty/libfsp + INSTALL_DIR ${CMAKE_BINARY_DIR} + 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) +else() + list(APPEND _ext_project_args + BUILD_BYPRODUCTS ${FSP_LIBRARIES}) +endif() +ExternalProject_Add(${_ext_project_args}) +unset(_ext_project_args) + +set(FSP_IS_EXTERNAL_PROJECT ON CACHE BOOL "" FORCE) +# cmake-format: on diff --git a/FindImitatorThirdparty.cmake b/FindImitatorThirdparty.cmake index fbe35d7..7a715b0 100644 --- a/FindImitatorThirdparty.cmake +++ b/FindImitatorThirdparty.cmake @@ -23,18 +23,19 @@ list(APPEND _ext_project_args SOURCE_DIR ${CMAKE_SOURCE_DIR}/thirdparty/libimitator INSTALL_DIR ${CMAKE_BINARY_DIR} CMAKE_ARGS ${CMLIB_EXT_PROJ_DEFAULT_ARGS} + -DPREPROCMATH_PREFIX=${CMAKE_BINARY_DIR} + -DMYXLIB_PREFIX=${CMAKE_BINARY_DIR} ) if(ImitatorThirdparty_FIND_COMPONENTS STREQUAL "headers") list(APPEND _ext_project_args - BUILD_COMMAND true - INSTALL_COMMAND ${CMAKE_MAKE_PROGRAM} imitator-install-headers) + BUILD_COMMAND true + INSTALL_COMMAND ${CMAKE_MAKE_PROGRAM} imitator-install-headers) else() list(APPEND _ext_project_args - BUILD_BYPRODUCTS ${IMITATOR_LIBRARIES}) + BUILD_BYPRODUCTS ${IMITATOR_LIBRARIES}) endif() ExternalProject_Add(${_ext_project_args}) unset(_ext_project_args) set(IMITATOR_IS_EXTERNAL_PROJECT ON CACHE BOOL "" FORCE) # cmake-format: on - diff --git a/FindIonobaseThirdparty.cmake b/FindIonobaseThirdparty.cmake index 39b123f..b2f9ae9 100644 --- a/FindIonobaseThirdparty.cmake +++ b/FindIonobaseThirdparty.cmake @@ -1,25 +1,6 @@ # Подключение внешних проектов include(ExternalProject) -# cmake-format: off -list(APPEND _ext_project_args - libionobase - 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}) -unset(_ext_project_args) - -set(IONOBASE_IS_EXTERNAL_PROJECT ON CACHE BOOL "" FORCE) -# cmake-format: on - set(IONOBASE_PREFIX ${CMAKE_BINARY_DIR} CACHE FILEPATH "" FORCE) @@ -35,3 +16,24 @@ set(IONOBASE_LIBRARY_DIR set(IONOBASE_LIBRARIES ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}/libionobase.a CACHE FILEPATH "" FORCE) + +# cmake-format: off +list(APPEND _ext_project_args + libionobase + SOURCE_DIR ${CMAKE_SOURCE_DIR}/thirdparty/libionobase + INSTALL_DIR ${CMAKE_BINARY_DIR} + 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) +else() + list(APPEND _ext_project_args + BUILD_BYPRODUCTS ${IONOBASE_LIBRARIES}) +endif() +ExternalProject_Add(${_ext_project_args}) +unset(_ext_project_args) + +set(IONOBASE_IS_EXTERNAL_PROJECT ON CACHE BOOL "" FORCE) +# cmake-format: on diff --git a/FindMyxNotificationsThirdparty.cmake b/FindMyxNotificationsThirdparty.cmake index 729240a..77634f5 100644 --- a/FindMyxNotificationsThirdparty.cmake +++ b/FindMyxNotificationsThirdparty.cmake @@ -1,27 +1,6 @@ # Подключение внешних проектов 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} - 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) -else() - list(APPEND _ext_project_args - BUILD_BYPRODUCTS ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}/libmyx-notifications.a) -endif() -ExternalProject_Add(${_ext_project_args}) -unset(_ext_project_args) - -set(MYX_NOTIFICATIONS_IS_EXTERNAL_PROJECT ON CACHE BOOL "" FORCE) -# cmake-format: on - set(MYX_NOTIFICATIONS_PREFIX ${CMAKE_BINARY_DIR} CACHE FILEPATH "" FORCE) @@ -37,3 +16,24 @@ set(MYX_NOTIFICATIONS_LIBRARY_DIR set(MYX_NOTIFICATIONS_LIBRARIES ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}/libmyx-notifications.a CACHE FILEPATH "" FORCE) + +# cmake-format: off +list(APPEND _ext_project_args + myx-notifications + SOURCE_DIR ${CMAKE_SOURCE_DIR}/thirdparty/myx-notifications + INSTALL_DIR ${CMAKE_BINARY_DIR} + 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) +else() + list(APPEND _ext_project_args + BUILD_BYPRODUCTS ${MYX_NOTIFICATIONS_LIBRARIES}) +endif() +ExternalProject_Add(${_ext_project_args}) +unset(_ext_project_args) + +set(MYX_NOTIFICATIONS_IS_EXTERNAL_PROJECT ON CACHE BOOL "" FORCE) +# cmake-format: on diff --git a/FindMyxQPingThirdparty.cmake b/FindMyxQPingThirdparty.cmake index b20f794..c124761 100644 --- a/FindMyxQPingThirdparty.cmake +++ b/FindMyxQPingThirdparty.cmake @@ -1,25 +1,6 @@ # Подключение внешних проектов 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} - 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}) -unset(_ext_project_args) - -set(MYX_QPING_IS_EXTERNAL_PROJECT ON CACHE BOOL "" FORCE) -# cmake-format: on - set(MYX_QPING_PREFIX ${CMAKE_BINARY_DIR} CACHE FILEPATH "" FORCE) @@ -35,3 +16,24 @@ set(MYX_QPING_LIBRARY_DIR set(MYX_QPING_LIBRARIES ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}/libmyx-qping.a CACHE FILEPATH "" FORCE) + +# cmake-format: off +list(APPEND _ext_project_args + myx-qping + SOURCE_DIR ${CMAKE_SOURCE_DIR}/thirdparty/myx-qping + INSTALL_DIR ${CMAKE_BINARY_DIR} + 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) +else() + list(APPEND _ext_project_args + BUILD_BYPRODUCTS ${MYX_QPING_LIBRARIES}) +endif() +ExternalProject_Add(${_ext_project_args}) +unset(_ext_project_args) + +set(MYX_QPING_IS_EXTERNAL_PROJECT ON CACHE BOOL "" FORCE) +# cmake-format: on diff --git a/FindMyxRedisThirdparty.cmake b/FindMyxRedisThirdparty.cmake index 243c759..5e73dfb 100644 --- a/FindMyxRedisThirdparty.cmake +++ b/FindMyxRedisThirdparty.cmake @@ -1,25 +1,6 @@ # Подключение внешних проектов 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} - 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}) -unset(_ext_project_args) - -set(MYX_REDIS_IS_EXTERNAL_PROJECT ON CACHE BOOL "" FORCE) -# cmake-format: on - set(MYX_REDIS_PREFIX ${CMAKE_BINARY_DIR} CACHE FILEPATH "" FORCE) @@ -35,3 +16,24 @@ set(MYX_REDIS_LIBRARY_DIR set(MYX_REDIS_LIBRARIES ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}/libmyx-redis.a CACHE FILEPATH "" FORCE) + +# cmake-format: off +list(APPEND _ext_project_args + myx-redis + SOURCE_DIR ${CMAKE_SOURCE_DIR}/thirdparty/myx-redis + INSTALL_DIR ${CMAKE_BINARY_DIR} + 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) +else() + list(APPEND _ext_project_args + BUILD_BYPRODUCTS ${MYX_REDIS_LIBRARIES}) +endif() +ExternalProject_Add(${_ext_project_args}) +unset(_ext_project_args) + +set(MYX_REDIS_IS_EXTERNAL_PROJECT ON CACHE BOOL "" FORCE) +# cmake-format: on diff --git a/FindMyxlibThirdparty.cmake b/FindMyxlibThirdparty.cmake index 6c9866c..b0861a3 100644 --- a/FindMyxlibThirdparty.cmake +++ b/FindMyxlibThirdparty.cmake @@ -1,28 +1,6 @@ # Подключение внешних проектов include(ExternalProject) -# cmake-format: off -list(APPEND _ext_project_args - myxlib - SOURCE_DIR ${CMAKE_SOURCE_DIR}/thirdparty/myxlib - INSTALL_DIR ${CMAKE_BINARY_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) -else() - list(APPEND _ext_project_args - BUILD_BYPRODUCTS ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}/libmyx-qt.a - ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}/libmyx-filesystem.a) -endif() -ExternalProject_Add(${_ext_project_args}) -unset(_ext_project_args) - -set(MYXLIB_IS_EXTERNAL_PROJECT ON CACHE BOOL "" FORCE) -# cmake-format: on - set(MYXLIB_PREFIX ${CMAKE_BINARY_DIR} CACHE FILEPATH "" FORCE) @@ -45,3 +23,24 @@ set(MYXLIB_LIBRARIES ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}/libmyx-qt.a ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}/libmyx-filesystem.a CACHE FILEPATH "" FORCE) + +# cmake-format: off +list(APPEND _ext_project_args + myxlib + SOURCE_DIR ${CMAKE_SOURCE_DIR}/thirdparty/myxlib + INSTALL_DIR ${CMAKE_BINARY_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) +else() + list(APPEND _ext_project_args + BUILD_BYPRODUCTS ${MYXLIB_LIBRARIES}) +endif() +ExternalProject_Add(${_ext_project_args}) +unset(_ext_project_args) + +set(MYXLIB_IS_EXTERNAL_PROJECT ON CACHE BOOL "" FORCE) +# cmake-format: on diff --git a/FindPreprocThirdparty.cmake b/FindPreprocThirdparty.cmake index 66f6bf9..4b000a4 100644 --- a/FindPreprocThirdparty.cmake +++ b/FindPreprocThirdparty.cmake @@ -1,27 +1,6 @@ # Подключение внешних проектов include(ExternalProject) -# cmake-format: off -list(APPEND _ext_project_args - libpreproc - DEPENDS libpreprocmath - 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}) -unset(_ext_project_args) - -set(PREPROC_IS_EXTERNAL_PROJECT ON CACHE BOOL "" FORCE) -# cmake-format: on - set(PREPROC_PREFIX ${CMAKE_BINARY_DIR} CACHE FILEPATH "" FORCE) @@ -37,3 +16,26 @@ set(PREPROC_LIBRARY_DIR set(PREPROC_LIBRARIES ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}/libpreproc.a CACHE FILEPATH "" FORCE) + +# cmake-format: off +list(APPEND _ext_project_args + libpreproc + DEPENDS libpreprocmath + SOURCE_DIR ${CMAKE_SOURCE_DIR}/thirdparty/libpreproc + INSTALL_DIR ${CMAKE_BINARY_DIR} + 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) +else() + list(APPEND _ext_project_args + BUILD_BYPRODUCTS ${PREPROC_LIBRARIES}) +endif() +ExternalProject_Add(${_ext_project_args}) +unset(_ext_project_args) + +set(PREPROC_IS_EXTERNAL_PROJECT ON CACHE BOOL "" FORCE) +# cmake-format: on diff --git a/FindPreprocmathThirdparty.cmake b/FindPreprocmathThirdparty.cmake index 0f225f5..215a7d6 100644 --- a/FindPreprocmathThirdparty.cmake +++ b/FindPreprocmathThirdparty.cmake @@ -1,25 +1,6 @@ # Подключение внешних проектов include(ExternalProject) -# cmake-format: off -list(APPEND _ext_project_args - libpreprocmath - 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}) -unset(_ext_project_args) - -set(PREPROCMATH_IS_EXTERNAL_PROJECT ON CACHE BOOL "" FORCE) -# cmake-format: on - set(PREPROCMATH_PREFIX ${CMAKE_BINARY_DIR} CACHE FILEPATH "" FORCE) @@ -35,3 +16,24 @@ set(PREPROCMATH_LIBRARY_DIR set(PREPROCMATH_LIBRARIES ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}/libpreprocmath.a CACHE FILEPATH "" FORCE) + +# cmake-format: off +list(APPEND _ext_project_args + libpreprocmath + SOURCE_DIR ${CMAKE_SOURCE_DIR}/thirdparty/libpreprocmath + INSTALL_DIR ${CMAKE_BINARY_DIR} + 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) +else() + list(APPEND _ext_project_args + BUILD_BYPRODUCTS ${PREPROCMATH_LIBRARIES}) +endif() +ExternalProject_Add(${_ext_project_args}) +unset(_ext_project_args) + +set(PREPROCMATH_IS_EXTERNAL_PROJECT ON CACHE BOOL "" FORCE) +# cmake-format: on diff --git a/FindSignalViewThirdparty.cmake b/FindSignalViewThirdparty.cmake index 963e8ca..59fd332 100644 --- a/FindSignalViewThirdparty.cmake +++ b/FindSignalViewThirdparty.cmake @@ -1,27 +1,6 @@ # Подключение внешних проектов include(ExternalProject) -# cmake-format: off -list(APPEND _ext_project_args - libsignalview - DEPENDS libpreprocmath - 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}) -unset(_ext_project_args) - -set(SIGNALVIEW_IS_EXTERNAL_PROJECT ON CACHE BOOL "" FORCE) -# cmake-format: on - set(SIGNALVIEW_PREFIX ${CMAKE_BINARY_DIR} CACHE FILEPATH "" FORCE) @@ -37,3 +16,26 @@ set(SIGNALVIEW_LIBRARY_DIR set(SIGNALVIEW_LIBRARIES ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}/libsignalview.a CACHE FILEPATH "" FORCE) + +# cmake-format: off +list(APPEND _ext_project_args + libsignalview + DEPENDS libpreprocmath + SOURCE_DIR ${CMAKE_SOURCE_DIR}/thirdparty/libsignalview + INSTALL_DIR ${CMAKE_BINARY_DIR} + 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) +else() + list(APPEND _ext_project_args + BUILD_BYPRODUCTS ${SIGNALVIEW_LIBRARIES}) +endif() +ExternalProject_Add(${_ext_project_args}) +unset(_ext_project_args) + +set(SIGNALVIEW_IS_EXTERNAL_PROJECT ON CACHE BOOL "" FORCE) +# cmake-format: on