SHS/libs
Archived
3
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

git-svn-id: svn://db.shs.com.ru/libs@862 a8b55f48-bf90-11e4-a774-851b48703e85

Browse Source
This commit is contained in:
Пелипенко Иван
2020-03-18 21:29:14 +00:00
parent 180af69bae
commit 2683ab7a07
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
deploy_tool/main.cpp
View File

@@ -299,6 +299,8 @@ void procDpkg(const PIString & l) {
vs = vs.left(vs.find(":")); vs = vs.left(vs.find(":"));
if (!vs.isEmpty()) if (!vs.isEmpty())
all_deps << vs; all_deps << vs;
else
piCout << "No dep on" << l;
} }
} }

4
qad/QADDeploy.cmake
View File

@@ -181,8 +181,6 @@ macro(deploy_target _T)
if (NOT CMAKE_LDD) if (NOT CMAKE_LDD)
find_program(CMAKE_LDD ldd) find_program(CMAKE_LDD ldd)
endif() endif()
set(_DEB "${_TV}_deb_${MY_ARCH}")
set(_AGD "${_DEPLOY_DIR}/${_DEB}")
string(REPLACE "_" "-" _DEBNAME "${_T}") string(REPLACE "_" "-" _DEBNAME "${_T}")
set(_DEB_ARCH) set(_DEB_ARCH)
if("_${MY_ARCH}" STREQUAL "_arm64") if("_${MY_ARCH}" STREQUAL "_arm64")
@@ -200,6 +198,8 @@ macro(deploy_target _T)
elseif("_${MY_ARCH}" STREQUAL "_ia64") elseif("_${MY_ARCH}" STREQUAL "_ia64")
set(_DEB_ARCH "ia64") set(_DEB_ARCH "ia64")
endif() endif()
set(_DEB "${_TV}_deb_${_DEB_ARCH}")
set(_AGD "${_DEPLOY_DIR}/${_DEB}")
set(_echof ">" "${_AGD}/DEBIAN/control") set(_echof ">" "${_AGD}/DEBIAN/control")
set(_echo ">>" "${_AGD}/DEBIAN/control") set(_echo ">>" "${_AGD}/DEBIAN/control")
add_custom_target(deploy add_custom_target(deploy