Замена <INSTALL_DIR> на ${CMAKE_BINARY_DIR}

2021-07-05 10:35:15 +03:00 · 2021-07-05 10:35:15 +03:00 · beb7bfa001
commit beb7bfa001
parent 465ad38cb8
11 changed files with 12 additions and 12 deletions
--- 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  <INSTALL_DIR>/${CMAKE_INSTALL_LIBDIR}/libcgal-widget.a
+  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")
--- 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  <INSTALL_DIR>/${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}
--- 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  <INSTALL_DIR>/${CMAKE_INSTALL_LIBDIR}/libionobase.a
+  BYPRODUCTS  ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}/libionobase.a
  CMAKE_ARGS  ${CMLIB_EXT_PROJ_DEFAULT_ARGS}
              <SOURCE_DIR>)
 if(IonobaseThirdparty_FIND_COMPONENTS STREQUAL "headers")
--- 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 <SOURCE_DIR>/mpreal.h <INSTALL_DIR>)
+    INSTALL_COMMAND ${CMAKE_COMMAND} -E copy <SOURCE_DIR>/mpreal.h ${CMAKE_BINARY_DIR})
 endif()

 set(MPFRCPP_PREFIX  ${CMAKE_BINARY_DIR} CACHE FILEPATH "" FORCE)
--- 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  <INSTALL_DIR>/${CMAKE_INSTALL_LIBDIR}/libmyx-notifications.a
+  BYPRODUCTS  ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}/libmyx-notifications.a
  CMAKE_ARGS  ${CMLIB_EXT_PROJ_DEFAULT_ARGS}
              <SOURCE_DIR>)
 if(MyxNotificationsThirdparty_FIND_COMPONENTS STREQUAL "headers")
--- 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  <INSTALL_DIR>/${CMAKE_INSTALL_LIBDIR}/libmyx-qping.a
+  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")
--- 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  <INSTALL_DIR>/${CMAKE_INSTALL_LIBDIR}/libmyx-redis.a
+  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")
--- 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  <INSTALL_DIR>/${CMAKE_INSTALL_LIBDIR}/libmyx-qt.a
-              <INSTALL_DIR>/${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}
              <SOURCE_DIR>)
 if(MyxlibThirdparty_FIND_COMPONENTS STREQUAL "headers")
--- 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  <INSTALL_DIR>/${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}
              <SOURCE_DIR>)
--- 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  <INSTALL_DIR>/${CMAKE_INSTALL_LIBDIR}/libpreprocmath.a
+  BYPRODUCTS  ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}/libpreprocmath.a
  CMAKE_ARGS  ${CMLIB_EXT_PROJ_DEFAULT_ARGS}
              <SOURCE_DIR>)
 if(PreprocmathThirdparty_FIND_COMPONENTS STREQUAL "headers")
--- 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  <INSTALL_DIR>/${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}
              <SOURCE_DIR>)