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}")