Правка thirdparty

libimitator
2021-08-02 17:59:39 +03:00 · 2021-08-02 16:55:24 +03:00
13 changed files with 314 additions and 213 deletions
--- 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}
-                   <SOURCE_DIR>)
-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}
+                   <SOURCE_DIR>)
+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
--- 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)
--- 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}
-                   <SOURCE_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}
+                   <SOURCE_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
--- a/FindImitator.cmake
+++ b/FindImitator.cmake
@@ -0,0 +1,45 @@
+if(NOT IMITATOR_IS_EXTERNAL_PROJECT)
+  set(IMITATOR_PREFIX "" CACHE PATH "The path to the prefix of an libimitator installation")
+  set(IMITATOR_INCLUDE_DIR "" CACHE PATH "The path to the headers of an libimitator installation")
+  set(IMITATOR_LIBRARY_DIR "" CACHE PATH "The path to the library of an libimitator installation")
+
+  set(_search_paths "")
+  if(IMITATOR_INCLUDE_DIR AND EXISTS ${IMITATOR_INCLUDE_DIR})
+    list(APPEND _search_paths ${IMITATOR_INCLUDE_DIR})
+  endif()
+  if(IMITATOR_PREFIX AND EXISTS ${IMITATOR_PREFIX})
+    list(APPEND _search_paths "${IMITATOR_PREFIX}/include")
+  endif()
+  find_path(
+    IMITATOR_INCLUDE_DIRS
+    NAMES imitator/imitator.hpp
+    PATHS ${_search_paths})
+
+  set(_search_paths "")
+  if(IMITATOR_LIBRARY_DIR AND EXISTS ${IMITATOR_LIBRARY_DIR})
+    list(APPEND _search_paths ${IMITATOR_LIBRARY_DIR})
+  endif()
+  if(IMITATOR_PREFIX AND EXISTS ${IMITATOR_PREFIX})
+    list(APPEND _search_paths "${IMITATOR_PREFIX}/lib")
+  endif()
+  find_library(
+    IMITATOR_LIBRARIES
+    NAMES imitator
+    PATHS ${_search_paths})
+  unset(_search_paths)
+
+  if(IMITATOR_INCLUDE_DIRS AND IMITATOR_LIBRARIES)
+    set(IMITATOR_FOUND TRUE)
+  endif()
+
+  if(IMITATOR_FOUND)
+    if(NOT IMITATOR_FIND_QUIETLY)
+      message(STATUS "Found libimitator")
+    endif()
+    set(HAVE_IMITATOR 1)
+  elseif(IMITATOR_FOUND)
+    if(IMITATOR_FIND_REQUIRED)
+      message(FATAL_ERROR "Could not find libimitator")
+    endif()
+  endif()
+endif()
--- a/FindImitatorThirdparty.cmake
+++ b/FindImitatorThirdparty.cmake
@@ -0,0 +1,41 @@
+# Подключение внешних проектов
+include(ExternalProject)
+
+set(IMITATOR_PREFIX
+    ${CMAKE_BINARY_DIR}
+    CACHE FILEPATH "" FORCE)
+set(IMITATOR_INCLUDE_DIR
+    ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_INCLUDEDIR}
+    CACHE PATH "" FORCE)
+set(IMITATOR_INCLUDE_DIRS
+    ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_INCLUDEDIR}
+    CACHE PATH "" FORCE)
+set(IMITATOR_LIBRARY_DIR
+    ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}
+    CACHE PATH "" FORCE)
+set(IMITATOR_LIBRARIES
+    ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}/libimitator.a
+    CACHE FILEPATH "" FORCE)
+
+# cmake-format: off
+list(APPEND _ext_project_args
+  libimitator
+  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}
+                   <SOURCE_DIR>)
+if(ImitatorThirdparty_FIND_COMPONENTS STREQUAL "headers")
+  list(APPEND _ext_project_args
+    BUILD_COMMAND    true
+    INSTALL_COMMAND  ${CMAKE_MAKE_PROGRAM} imitator-install-headers)
+else()
+  list(APPEND _ext_project_args
+    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
--- 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}
-                   <SOURCE_DIR>)
-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}
+                   <SOURCE_DIR>)
+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
--- 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}
-                   <SOURCE_DIR>)
-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}
+                   <SOURCE_DIR>)
+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
--- 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}
-                   <SOURCE_DIR>)
-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}
+                   <SOURCE_DIR>)
+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
--- 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}
-                   <SOURCE_DIR>)
-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}
+                   <SOURCE_DIR>)
+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
--- 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}
-                   <SOURCE_DIR>)
-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}
+                   <SOURCE_DIR>)
+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
--- 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}
-                   <SOURCE_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}
+                   <SOURCE_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
--- 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}
-                   <SOURCE_DIR>)
-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}
+                   <SOURCE_DIR>)
+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
--- 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}
-                   <SOURCE_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}
+                   <SOURCE_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
Author	SHA1	Message	Date
Andrey Astafyev	6a8dab968c	Правка thirdparty	2021-08-02 17:59:39 +03:00
Andrey Astafyev	99716263c8	libimitator	2021-08-02 16:55:24 +03:00