From beb7bfa0017ee2dedf2f0c2631c84aa8349ddebf Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Mon, 5 Jul 2021 10:35:15 +0300 Subject: [PATCH] =?UTF-8?q?=D0=97=D0=B0=D0=BC=D0=B5=D0=BD=D0=B0=20=20=D0=BD=D0=B0=20${CMAKE=5FBINARY=5FDIR}?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- FindCgalWidgetThirdparty.cmake | 2 +- FindFspThirdparty.cmake | 2 +- FindIonobaseThirdparty.cmake | 2 +- FindMPFRCppThirdparty.cmake | 2 +- FindMyxNotificationsThirdparty.cmake | 2 +- FindMyxQPingThirdparty.cmake | 2 +- FindMyxRedisThirdparty.cmake | 2 +- FindMyxlibThirdparty.cmake | 4 ++-- FindPreprocThirdparty.cmake | 2 +- FindPreprocmathThirdparty.cmake | 2 +- FindSignalViewThirdparty.cmake | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) diff --git a/FindCgalWidgetThirdparty.cmake b/FindCgalWidgetThirdparty.cmake index 8e2981e..c69f698 100644 --- a/FindCgalWidgetThirdparty.cmake +++ b/FindCgalWidgetThirdparty.cmake @@ -6,7 +6,7 @@ list(APPEND _ext_project_args cgal-widget SOURCE_DIR ${CMAKE_SOURCE_DIR}/thirdparty/cgal-widget INSTALL_DIR ${CMAKE_BINARY_DIR} - BYPRODUCTS /${CMAKE_INSTALL_LIBDIR}/libcgal-widget.a + BYPRODUCTS ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}/libcgal-widget.a CMAKE_ARGS ${CMLIB_EXT_PROJ_DEFAULT_ARGS} ) if(CgalWidgetThirdparty_FIND_COMPONENTS STREQUAL "headers") diff --git a/FindFspThirdparty.cmake b/FindFspThirdparty.cmake index 7a3d2a9..6b6ae2c 100644 --- a/FindFspThirdparty.cmake +++ b/FindFspThirdparty.cmake @@ -7,7 +7,7 @@ list(APPEND _ext_project_args DEPENDS libpreprocmath libionobase myxlib SOURCE_DIR ${CMAKE_SOURCE_DIR}/thirdparty/libfsp INSTALL_DIR ${CMAKE_BINARY_DIR} - BYPRODUCTS /${CMAKE_INSTALL_LIBDIR}/libfsp.a + 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} diff --git a/FindIonobaseThirdparty.cmake b/FindIonobaseThirdparty.cmake index 0d79ca7..7fa9c83 100644 --- a/FindIonobaseThirdparty.cmake +++ b/FindIonobaseThirdparty.cmake @@ -6,7 +6,7 @@ list(APPEND _ext_project_args libionobase SOURCE_DIR ${CMAKE_SOURCE_DIR}/thirdparty/libionobase INSTALL_DIR ${CMAKE_BINARY_DIR} - BYPRODUCTS /${CMAKE_INSTALL_LIBDIR}/libionobase.a + BYPRODUCTS ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}/libionobase.a CMAKE_ARGS ${CMLIB_EXT_PROJ_DEFAULT_ARGS} ) if(IonobaseThirdparty_FIND_COMPONENTS STREQUAL "headers") diff --git a/FindMPFRCppThirdparty.cmake b/FindMPFRCppThirdparty.cmake index 1797d17..c1f6efe 100644 --- a/FindMPFRCppThirdparty.cmake +++ b/FindMPFRCppThirdparty.cmake @@ -8,7 +8,7 @@ if(MPFR_FOUND) INSTALL_DIR ${CMAKE_BINARY_DIR}/include CONFIGURE_COMMAND true BUILD_COMMAND true - INSTALL_COMMAND ${CMAKE_COMMAND} -E copy /mpreal.h ) + INSTALL_COMMAND ${CMAKE_COMMAND} -E copy /mpreal.h ${CMAKE_BINARY_DIR}) endif() set(MPFRCPP_PREFIX ${CMAKE_BINARY_DIR} CACHE FILEPATH "" FORCE) diff --git a/FindMyxNotificationsThirdparty.cmake b/FindMyxNotificationsThirdparty.cmake index 2e75240..bb0f13e 100644 --- a/FindMyxNotificationsThirdparty.cmake +++ b/FindMyxNotificationsThirdparty.cmake @@ -6,7 +6,7 @@ list(APPEND _ext_project_args myx-notifications SOURCE_DIR ${CMAKE_SOURCE_DIR}/thirdparty/myx-notifications INSTALL_DIR ${CMAKE_BINARY_DIR} - BYPRODUCTS /${CMAKE_INSTALL_LIBDIR}/libmyx-notifications.a + BYPRODUCTS ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}/libmyx-notifications.a CMAKE_ARGS ${CMLIB_EXT_PROJ_DEFAULT_ARGS} ) if(MyxNotificationsThirdparty_FIND_COMPONENTS STREQUAL "headers") diff --git a/FindMyxQPingThirdparty.cmake b/FindMyxQPingThirdparty.cmake index db4f61b..869c173 100644 --- a/FindMyxQPingThirdparty.cmake +++ b/FindMyxQPingThirdparty.cmake @@ -6,7 +6,7 @@ list(APPEND _ext_project_args myx-qping SOURCE_DIR ${CMAKE_SOURCE_DIR}/thirdparty/myx-qping INSTALL_DIR ${CMAKE_BINARY_DIR} - BYPRODUCTS /${CMAKE_INSTALL_LIBDIR}/libmyx-qping.a + BYPRODUCTS ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}/libmyx-qping.a CMAKE_ARGS ${CMLIB_EXT_PROJ_DEFAULT_ARGS} ) if(MyxQPingThirdparty_FIND_COMPONENTS STREQUAL "headers") diff --git a/FindMyxRedisThirdparty.cmake b/FindMyxRedisThirdparty.cmake index c49c8a1..2a0220c 100644 --- a/FindMyxRedisThirdparty.cmake +++ b/FindMyxRedisThirdparty.cmake @@ -6,7 +6,7 @@ list(APPEND _ext_project_args myx-redis SOURCE_DIR ${CMAKE_SOURCE_DIR}/thirdparty/myx-redis INSTALL_DIR ${CMAKE_BINARY_DIR} - BYPRODUCTS /${CMAKE_INSTALL_LIBDIR}/libmyx-redis.a + BYPRODUCTS ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}/libmyx-redis.a CMAKE_ARGS ${CMLIB_EXT_PROJ_DEFAULT_ARGS} ) if(MyxRedisThirdparty_FIND_COMPONENTS STREQUAL "headers") diff --git a/FindMyxlibThirdparty.cmake b/FindMyxlibThirdparty.cmake index c5a5771..555ff98 100644 --- a/FindMyxlibThirdparty.cmake +++ b/FindMyxlibThirdparty.cmake @@ -6,8 +6,8 @@ list(APPEND _ext_project_args myxlib 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 + BYPRODUCTS ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}/libmyx-qt.a + ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}/libmyx-filesystem.a CMAKE_ARGS ${CMLIB_EXT_PROJ_DEFAULT_ARGS} ) if(MyxlibThirdparty_FIND_COMPONENTS STREQUAL "headers") diff --git a/FindPreprocThirdparty.cmake b/FindPreprocThirdparty.cmake index db5bd91..19a7898 100644 --- a/FindPreprocThirdparty.cmake +++ b/FindPreprocThirdparty.cmake @@ -7,7 +7,7 @@ list(APPEND _ext_project_args DEPENDS libpreprocmath SOURCE_DIR ${CMAKE_SOURCE_DIR}/thirdparty/libpreproc INSTALL_DIR ${CMAKE_BINARY_DIR} - BYPRODUCTS /${CMAKE_INSTALL_LIBDIR}/libpreproc.a + BYPRODUCTS ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}/libpreproc.a CMAKE_ARGS ${CMLIB_EXT_PROJ_DEFAULT_ARGS} -DPREPROCMATH_PREFIX=${CMAKE_BINARY_DIR} ) diff --git a/FindPreprocmathThirdparty.cmake b/FindPreprocmathThirdparty.cmake index 72bb126..ab359dd 100644 --- a/FindPreprocmathThirdparty.cmake +++ b/FindPreprocmathThirdparty.cmake @@ -6,7 +6,7 @@ list(APPEND _ext_project_args libpreprocmath SOURCE_DIR ${CMAKE_SOURCE_DIR}/thirdparty/libpreprocmath INSTALL_DIR ${CMAKE_BINARY_DIR} - BYPRODUCTS /${CMAKE_INSTALL_LIBDIR}/libpreprocmath.a + BYPRODUCTS ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}/libpreprocmath.a CMAKE_ARGS ${CMLIB_EXT_PROJ_DEFAULT_ARGS} ) if(PreprocmathThirdparty_FIND_COMPONENTS STREQUAL "headers") diff --git a/FindSignalViewThirdparty.cmake b/FindSignalViewThirdparty.cmake index acd8f67..d90bba0 100644 --- a/FindSignalViewThirdparty.cmake +++ b/FindSignalViewThirdparty.cmake @@ -7,7 +7,7 @@ list(APPEND _ext_project_args DEPENDS libpreprocmath SOURCE_DIR ${CMAKE_SOURCE_DIR}/thirdparty/libsignalview INSTALL_DIR ${CMAKE_BINARY_DIR} - BYPRODUCTS /${CMAKE_INSTALL_LIBDIR}/libsignalview.a + BYPRODUCTS ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}/libsignalview.a CMAKE_ARGS ${CMLIB_EXT_PROJ_DEFAULT_ARGS} -DPREPROCMATH_PREFIX=${CMAKE_BINARY_DIR} )