SHS/pip
4
3
Fork 0
Code Issues 67 Pull Requests 1 Actions Releases Wiki Activity

git-svn-id: svn://db.shs.com.ru/pip@988 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5

Browse Source
This commit is contained in:
Пелипенко Иван
2020-03-26 07:11:31 +00:00
parent 85bd197762
commit 8062e18a9a
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
cmake/DeployMacros.cmake
View File

@@ -70,6 +70,7 @@
# PLUGINS | root | /usr/lib/COMPANY | Contents/PlugIns # PLUGINS | root | /usr/lib/COMPANY | Contents/PlugIns
# FILES | root | /usr/bin | Contents/MacOS # FILES | root | /usr/bin | Contents/MacOS
# #
# Relative paths are taken from DEPLOY_DIR
# Also check library dependencies from PLUGINS and FILES # Also check library dependencies from PLUGINS and FILES
# #
# #
@@ -294,12 +295,12 @@ END
endmacro() endmacro()
macro(__add_file_or_dir _DIR_VAR _FILE_VAR _PATH) macro(__add_file_or_dir _DIR_VAR _FILE_VAR _PATH _RELPATH)
set(_p) set(_p)
if (IS_ABSOLUTE "${_PATH}") if (IS_ABSOLUTE "${_PATH}")
set(_p "${_PATH}") set(_p "${_PATH}")
else() else()
set(_p "${CMAKE_CURRENT_SOURCE_DIR}/${_PATH}") set(_p "${_RELPATH}/${_PATH}")
endif() endif()
if (EXISTS "${_p}") if (EXISTS "${_p}")
if (IS_DIRECTORY "${_p}") if (IS_DIRECTORY "${_p}")
@@ -356,11 +357,11 @@ macro(deploy_target _T)
set(_is_deploy_dir 0) set(_is_deploy_dir 0)
set(_DEPLOY_DIR "${_i}/") set(_DEPLOY_DIR "${_i}/")
elseif (_is_res) elseif (_is_res)
__add_file_or_dir(_RES_DIRS _RES_FILES "${_i}") __add_file_or_dir(_RES_DIRS _RES_FILES "${_i}" "${_DEPLOY_DIR}")
elseif (_is_plug) elseif (_is_plug)
__add_file_or_dir(_PLUG_DIRS _PLUG_FILES "${_i}") __add_file_or_dir(_PLUG_DIRS _PLUG_FILES "${_i}" "${_DEPLOY_DIR}")
elseif (_is_file) elseif (_is_file)
__add_file_or_dir(_FILE_DIRS _FILE_FILES "${_i}") __add_file_or_dir(_FILE_DIRS _FILE_FILES "${_i}" "${_DEPLOY_DIR}")
endif() endif()
endif() endif()
#message("-i = ${_i}") #message("-i = ${_i}")