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@1020 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5

Browse Source
This commit is contained in:
Пелипенко Иван
2020-04-16 07:47:08 +00:00
parent 6acce46584
commit c4afee9e89
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
cmake/DeployMacros.cmake
View File

@@ -363,9 +363,13 @@ macro(__add_file_or_dir _DIR_VAR _FILE_VAR _PATH _RELPATH)
endmacro() endmacro()
set(__win_host 0) set(__win_host 0)
set(__mac_host 0)
if ("x${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "xWindows") if ("x${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "xWindows")
set(__win_host 1) set(__win_host 1)
endif() endif()
if ("x${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "xDarwin")
set(__mac_host 1)
endif()
macro(__make_win_path _in_path _out_var _is_dir _out_dir) macro(__make_win_path _in_path _out_var _is_dir _out_dir)
set(_add "") set(_add "")
@@ -634,6 +638,10 @@ macro(deploy_target _T)
if (NOT CMAKE_PREFIX_PATH) if (NOT CMAKE_PREFIX_PATH)
set(CMAKE_PREFIX_PATH "/usr/local") set(CMAKE_PREFIX_PATH "/usr/local")
endif() endif()
set(_cmd_gen_dmg COMMAND genisoimage -quiet -V "${MACOSX_BUNDLE_BUNDLE_NAME}" -D -R -apple -no-pad -o ${_DESTINATION}/${_TV}.dmg ${_DMG})
if (__mac_host)
set(_cmd_gen_dmg COMMAND hdiutil create ${_DESTINATION}/${_TV}.dmg -ov -volname "${MACOSX_BUNDLE_BUNDLE_NAME}" -fs HFS+ -srcfolder ${_DMG})
endif()
add_custom_target(deploy_${_T} add_custom_target(deploy_${_T}
# gather .app dir # gather .app dir
COMMAND mkdir ${_VERB} -p ${_AGD}/Contents/Resources COMMAND mkdir ${_VERB} -p ${_AGD}/Contents/Resources
@@ -647,9 +655,9 @@ macro(deploy_target _T)
COMMAND rm -rf ${_DMG} COMMAND rm -rf ${_DMG}
COMMAND mkdir ${_VERB} -p ${_DMG} COMMAND mkdir ${_VERB} -p ${_DMG}
COMMAND cp -r ${_AGD} ${_DMG} COMMAND cp -r ${_AGD} ${_DMG}
COMMAND ln ${_VERB} --symbolic /Applications ${_DMG} COMMAND ln ${_VERB} -s /Applications ${_DMG}
# generate dmg # generate dmg
COMMAND genisoimage -quiet -V "${MACOSX_BUNDLE_BUNDLE_NAME}" -D -R -apple -no-pad -o ${_DESTINATION}/${_TV}.dmg ${_DMG} ${_cmd_gen_dmg}
COMMENT "Generating ${_TV}.dmg" COMMENT "Generating ${_TV}.dmg"
) )
set(_has_deploy 1) set(_has_deploy 1)

6
utils/deploy_tool/main.cpp
View File

@@ -427,9 +427,9 @@ int main(int argc, char * argv[]) {
} }
if (etcnt > 0) is_ldd = false; if (etcnt > 0) is_ldd = false;
if (!qt_dir.isEmpty()) { if (!qt_dir.isEmpty()) {
PIString qbin = qt_dir; PIString qroot = qt_dir;
if (!qbin.endsWith("/")) qbin.append("/"); if (!qroot.endsWith("/")) qroot.append("/");
lib_dirs << (qbin + "bin"); lib_dirs << (qroot + "bin") << (qroot + "lib") << (qroot + "Frameworks");
} }
piForeach (PIString & s, lib_dirs) { piForeach (PIString & s, lib_dirs) {
s.trim(); s.trim();