From f156a614aace52c184bf8fe73aa81a5ac36ebaf5 Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Sun, 12 Dec 2021 23:00:31 +0300 Subject: [PATCH] =?UTF-8?q?=D0=97=D0=B0=D0=BC=D0=B5=D0=BD=D0=B0=20=D0=B8?= =?UTF-8?q?=D0=BC=D0=B5=D0=BD=D0=B8=20=D0=BF=D0=B5=D1=80=D0=B5=D0=BC=D0=B5?= =?UTF-8?q?=D0=BD=D0=BD=D1=8B=D1=85=20=D0=B2=20=D0=BC=D0=BE=D0=B4=D1=83?= =?UTF-8?q?=D0=BB=D1=8F=D1=85=20=D0=BF=D0=BE=D0=B8=D1=81=D0=BA=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- MyxCMake/find/FindCgalWidgetThirdparty.cmake | 2 +- MyxCMake/find/FindFcProtocolThirdparty.cmake | 2 +- MyxCMake/find/FindFspThirdparty.cmake | 2 +- MyxCMake/find/FindImitatorThirdparty.cmake | 2 +- MyxCMake/find/FindIonobaseThirdparty.cmake | 2 +- MyxCMake/find/FindMyxNotificationsThirdparty.cmake | 2 +- MyxCMake/find/FindMyxQPingThirdparty.cmake | 2 +- MyxCMake/find/FindMyxRedisThirdparty.cmake | 2 +- MyxCMake/find/FindMyxlibThirdparty.cmake | 2 +- MyxCMake/find/FindPreprocThirdparty.cmake | 2 +- MyxCMake/find/FindPreprocmathThirdparty.cmake | 2 +- MyxCMake/find/FindSignalViewThirdparty.cmake | 2 +- MyxCMake/find/FindVeerProtocolsThirdparty.cmake | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/MyxCMake/find/FindCgalWidgetThirdparty.cmake b/MyxCMake/find/FindCgalWidgetThirdparty.cmake index b4a669e..88b0c6a 100644 --- a/MyxCMake/find/FindCgalWidgetThirdparty.cmake +++ b/MyxCMake/find/FindCgalWidgetThirdparty.cmake @@ -22,7 +22,7 @@ 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} + CMAKE_ARGS ${MYX_CMAKE_EXTERNAL_PROJECT_ARGS} ) if(CgalWidgetThirdparty_FIND_COMPONENTS STREQUAL "headers") list(APPEND _ext_project_args diff --git a/MyxCMake/find/FindFcProtocolThirdparty.cmake b/MyxCMake/find/FindFcProtocolThirdparty.cmake index 58af740..9e5778c 100644 --- a/MyxCMake/find/FindFcProtocolThirdparty.cmake +++ b/MyxCMake/find/FindFcProtocolThirdparty.cmake @@ -16,7 +16,7 @@ list(APPEND _ext_project_args fc-protocol SOURCE_DIR ${CMAKE_SOURCE_DIR}/thirdparty/fc-protocol INSTALL_DIR ${CMAKE_BINARY_DIR} - CMAKE_ARGS ${CMLIB_EXT_PROJ_DEFAULT_ARGS} + CMAKE_ARGS ${MYX_CMAKE_EXTERNAL_PROJECT_ARGS} ) if(FcProtocolThirdparty_FIND_COMPONENTS STREQUAL "headers") list(APPEND _ext_project_args diff --git a/MyxCMake/find/FindFspThirdparty.cmake b/MyxCMake/find/FindFspThirdparty.cmake index 8e5b5b1..8a207c4 100644 --- a/MyxCMake/find/FindFspThirdparty.cmake +++ b/MyxCMake/find/FindFspThirdparty.cmake @@ -23,7 +23,7 @@ list(APPEND _ext_project_args DEPENDS libpreprocmath libionobase myxlib SOURCE_DIR ${CMAKE_SOURCE_DIR}/thirdparty/libfsp INSTALL_DIR ${CMAKE_BINARY_DIR} - CMAKE_ARGS ${CMLIB_EXT_PROJ_DEFAULT_ARGS} + CMAKE_ARGS ${MYX_CMAKE_EXTERNAL_PROJECT_ARGS} -DPREPROCMATH_PREFIX=${CMAKE_BINARY_DIR} -DIONOBASE_PREFIX=${CMAKE_BINARY_DIR} -DMYXLIB_PREFIX=${CMAKE_BINARY_DIR} diff --git a/MyxCMake/find/FindImitatorThirdparty.cmake b/MyxCMake/find/FindImitatorThirdparty.cmake index 7a715b0..77d36e3 100644 --- a/MyxCMake/find/FindImitatorThirdparty.cmake +++ b/MyxCMake/find/FindImitatorThirdparty.cmake @@ -22,7 +22,7 @@ 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} + CMAKE_ARGS ${MYX_CMAKE_EXTERNAL_PROJECT_ARGS} -DPREPROCMATH_PREFIX=${CMAKE_BINARY_DIR} -DMYXLIB_PREFIX=${CMAKE_BINARY_DIR} ) diff --git a/MyxCMake/find/FindIonobaseThirdparty.cmake b/MyxCMake/find/FindIonobaseThirdparty.cmake index b2f9ae9..9e9ae86 100644 --- a/MyxCMake/find/FindIonobaseThirdparty.cmake +++ b/MyxCMake/find/FindIonobaseThirdparty.cmake @@ -22,7 +22,7 @@ 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} + CMAKE_ARGS ${MYX_CMAKE_EXTERNAL_PROJECT_ARGS} ) if(IonobaseThirdparty_FIND_COMPONENTS STREQUAL "headers") list(APPEND _ext_project_args diff --git a/MyxCMake/find/FindMyxNotificationsThirdparty.cmake b/MyxCMake/find/FindMyxNotificationsThirdparty.cmake index 77634f5..6f94ab8 100644 --- a/MyxCMake/find/FindMyxNotificationsThirdparty.cmake +++ b/MyxCMake/find/FindMyxNotificationsThirdparty.cmake @@ -22,7 +22,7 @@ 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} + CMAKE_ARGS ${MYX_CMAKE_EXTERNAL_PROJECT_ARGS} ) if(MyxNotificationsThirdparty_FIND_COMPONENTS STREQUAL "headers") list(APPEND _ext_project_args diff --git a/MyxCMake/find/FindMyxQPingThirdparty.cmake b/MyxCMake/find/FindMyxQPingThirdparty.cmake index c124761..ac1a96e 100644 --- a/MyxCMake/find/FindMyxQPingThirdparty.cmake +++ b/MyxCMake/find/FindMyxQPingThirdparty.cmake @@ -22,7 +22,7 @@ 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} + CMAKE_ARGS ${MYX_CMAKE_EXTERNAL_PROJECT_ARGS} ) if(MyxQPingThirdparty_FIND_COMPONENTS STREQUAL "headers") list(APPEND _ext_project_args diff --git a/MyxCMake/find/FindMyxRedisThirdparty.cmake b/MyxCMake/find/FindMyxRedisThirdparty.cmake index 5e73dfb..ddfa3b7 100644 --- a/MyxCMake/find/FindMyxRedisThirdparty.cmake +++ b/MyxCMake/find/FindMyxRedisThirdparty.cmake @@ -22,7 +22,7 @@ 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} + CMAKE_ARGS ${MYX_CMAKE_EXTERNAL_PROJECT_ARGS} ) if(MyxRedisThirdparty_FIND_COMPONENTS STREQUAL "headers") list(APPEND _ext_project_args diff --git a/MyxCMake/find/FindMyxlibThirdparty.cmake b/MyxCMake/find/FindMyxlibThirdparty.cmake index b0861a3..59a97a9 100644 --- a/MyxCMake/find/FindMyxlibThirdparty.cmake +++ b/MyxCMake/find/FindMyxlibThirdparty.cmake @@ -29,7 +29,7 @@ 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} + CMAKE_ARGS ${MYX_CMAKE_EXTERNAL_PROJECT_ARGS} ) if(MyxlibThirdparty_FIND_COMPONENTS STREQUAL "headers") list(APPEND _ext_project_args diff --git a/MyxCMake/find/FindPreprocThirdparty.cmake b/MyxCMake/find/FindPreprocThirdparty.cmake index 4b000a4..a1bd8c4 100644 --- a/MyxCMake/find/FindPreprocThirdparty.cmake +++ b/MyxCMake/find/FindPreprocThirdparty.cmake @@ -23,7 +23,7 @@ list(APPEND _ext_project_args DEPENDS libpreprocmath SOURCE_DIR ${CMAKE_SOURCE_DIR}/thirdparty/libpreproc INSTALL_DIR ${CMAKE_BINARY_DIR} - CMAKE_ARGS ${CMLIB_EXT_PROJ_DEFAULT_ARGS} + CMAKE_ARGS ${MYX_CMAKE_EXTERNAL_PROJECT_ARGS} -DPREPROCMATH_PREFIX=${CMAKE_BINARY_DIR} ) if(PreprocThirdparty_FIND_COMPONENTS STREQUAL "headers") diff --git a/MyxCMake/find/FindPreprocmathThirdparty.cmake b/MyxCMake/find/FindPreprocmathThirdparty.cmake index 215a7d6..fa7208d 100644 --- a/MyxCMake/find/FindPreprocmathThirdparty.cmake +++ b/MyxCMake/find/FindPreprocmathThirdparty.cmake @@ -22,7 +22,7 @@ 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} + CMAKE_ARGS ${MYX_CMAKE_EXTERNAL_PROJECT_ARGS} ) if(PreprocmathThirdparty_FIND_COMPONENTS STREQUAL "headers") list(APPEND _ext_project_args diff --git a/MyxCMake/find/FindSignalViewThirdparty.cmake b/MyxCMake/find/FindSignalViewThirdparty.cmake index 59fd332..95299c7 100644 --- a/MyxCMake/find/FindSignalViewThirdparty.cmake +++ b/MyxCMake/find/FindSignalViewThirdparty.cmake @@ -23,7 +23,7 @@ list(APPEND _ext_project_args DEPENDS libpreprocmath SOURCE_DIR ${CMAKE_SOURCE_DIR}/thirdparty/libsignalview INSTALL_DIR ${CMAKE_BINARY_DIR} - CMAKE_ARGS ${CMLIB_EXT_PROJ_DEFAULT_ARGS} + CMAKE_ARGS ${MYX_CMAKE_EXTERNAL_PROJECT_ARGS} -DPREPROCMATH_PREFIX=${CMAKE_BINARY_DIR} ) if(SignalViewThirdparty_FIND_COMPONENTS STREQUAL "headers") diff --git a/MyxCMake/find/FindVeerProtocolsThirdparty.cmake b/MyxCMake/find/FindVeerProtocolsThirdparty.cmake index 07a8a30..66467b7 100644 --- a/MyxCMake/find/FindVeerProtocolsThirdparty.cmake +++ b/MyxCMake/find/FindVeerProtocolsThirdparty.cmake @@ -6,7 +6,7 @@ list(APPEND _ext_project_args veer-protocols SOURCE_DIR ${CMAKE_SOURCE_DIR}/thirdparty/veer-protocols INSTALL_DIR ${CMAKE_BINARY_DIR} - CMAKE_ARGS ${CMLIB_EXT_PROJ_DEFAULT_ARGS} + CMAKE_ARGS ${MYX_CMAKE_EXTERNAL_PROJECT_ARGS} ) if(VeerProtocolsThirdparty_FIND_COMPONENTS STREQUAL "headers") list(APPEND _ext_project_args