From 732d1a8ca7713c3beb108fbb7831307b6c2fd0a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9F=D0=B5=D0=BB=D0=B8=D0=BF=D0=B5=D0=BD=D0=BA=D0=BE=20?= =?UTF-8?q?=D0=98=D0=B2=D0=B0=D0=BD?= Date: Sat, 18 Apr 2020 17:13:48 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/pip@1059 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5 --- cmake/DeployMacros.cmake | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cmake/DeployMacros.cmake b/cmake/DeployMacros.cmake index 80ec9d24..56a170de 100644 --- a/cmake/DeployMacros.cmake +++ b/cmake/DeployMacros.cmake @@ -82,6 +82,9 @@ FILES | root | /usr/bin | Contents/MacOS Relative paths are taken from DEPLOY_DIR Also check library dependencies from PLUGINS and FILES +Important! RESOURCES, PLUGINS and FILES lists check +at cmake-time, so if entry ends with "/" it treat +as directory, else - file This macro using "deploy_tool" from PIP, @@ -354,7 +357,7 @@ macro(__add_file_or_dir _DIR_VAR _FILE_VAR _PATH _RELPATH) set(_p "${_RELPATH}/${_PATH}") endif() #if (EXISTS "${_p}") - if (IS_DIRECTORY "${_p}") + if ("${_p}" MATCHES "*/") list(APPEND ${_DIR_VAR} "${_p}") else() list(APPEND ${_FILE_VAR} "${_p}")