SHS/cmake
4
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

support lists CMAKE_PREFIX_PATH

Browse Source
This commit is contained in:
Пелипенко Иван
2023-11-20 23:33:55 +03:00
parent c816ddc21e
commit 9fe2044e8f
1 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
DeployMacros.cmake
View File

@@ -371,7 +371,10 @@ macro(get_system _OS _ARCH)
set(_os_ver "") set(_os_ver "")
set(_paths "/usr/lib" "/etc") set(_paths "/usr/lib" "/etc")
if (CMAKE_CROSSCOMPILING) if (CMAKE_CROSSCOMPILING)
set(_paths "${CMAKE_PREFIX_PATH}/lib" "${CMAKE_PREFIX_PATH}/../etc") set(_paths "")
foreach (_c ${CMAKE_PREFIX_PATH})
list(APPEND _paths "${_c}/lib" "${_c}/../etc")
endforeach()
endif() endif()
find_file(_release_file NAMES os-release lsb-release PATHS ${_paths} NO_DEFAULT_PATH) find_file(_release_file NAMES os-release lsb-release PATHS ${_paths} NO_DEFAULT_PATH)
if (NOT "x${_release_file}" STREQUAL "x") if (NOT "x${_release_file}" STREQUAL "x")
@@ -584,10 +587,15 @@ macro(deploy_target _T)
endif() endif()
set(_dt_opts -l "${CMAKE_LDD}") set(_dt_opts -l "${CMAKE_LDD}")
if (CMAKE_CROSSCOMPILING) if (CMAKE_CROSSCOMPILING)
set(_dt_searchdirs "${CMAKE_PREFIX_PATH}/lib") set(_dt_searchdirs "")
foreach (_c ${CMAKE_PREFIX_PATH})
set(_dt_searchdirs "${_dt_searchdirs}${_dt_delim}${_c}/lib")
endforeach()
if (NOT "x${CMAKE_LIBRARY_ARCHITECTURE}" STREQUAL "x") if (NOT "x${CMAKE_LIBRARY_ARCHITECTURE}" STREQUAL "x")
set(_dt_searchdirs "${_dt_searchdirs}${_dt_delim}${CMAKE_PREFIX_PATH}/lib/${CMAKE_LIBRARY_ARCHITECTURE}") foreach (_c ${CMAKE_PREFIX_PATH})
set(_dt_searchdirs "${_dt_searchdirs}${_dt_delim}${CMAKE_PREFIX_PATH}/../lib/${CMAKE_LIBRARY_ARCHITECTURE}") set(_dt_searchdirs "${_dt_searchdirs}${_dt_delim}${_c}/lib/${CMAKE_LIBRARY_ARCHITECTURE}")
set(_dt_searchdirs "${_dt_searchdirs}${_dt_delim}${_c}/../lib/${CMAKE_LIBRARY_ARCHITECTURE}")
endforeach()
endif() endif()
if (NOT "x${PIP_DEPLOY_LIBDIR}" STREQUAL "x") if (NOT "x${PIP_DEPLOY_LIBDIR}" STREQUAL "x")
set(_dt_searchdirs "${_dt_searchdirs}${_dt_delim}${PIP_DEPLOY_LIBDIR}") set(_dt_searchdirs "${_dt_searchdirs}${_dt_delim}${PIP_DEPLOY_LIBDIR}")
@@ -710,11 +718,16 @@ macro(deploy_target _T)
__make_copy(_CMD_ _LIBS_DIRS _LIBS_FILES "${_AGD}") __make_copy(_CMD_ _LIBS_DIRS _LIBS_FILES "${_AGD}")
set(_zip_name "${_TV}_${_TARGET_OS}_${_TARGET_ARCH}.zip") set(_zip_name "${_TV}_${_TARGET_OS}_${_TARGET_ARCH}.zip")
set(_TARGET_PACKAGE "${_zip_name}") set(_TARGET_PACKAGE "${_zip_name}")
set(_search_path "")
foreach (_c ${CMAKE_PREFIX_PATH})
set(_search_path "${_search_path}${_dt_delim}${_c}/bin")
endforeach()
set(_search_path "${_search_path}${_dt_delim}${MINGW_BIN}${_add_search_path}${_dt_delim}${MINGW_LIB}")
add_custom_target(deploy_${_T} add_custom_target(deploy_${_T}
# gather dir # gather dir
${_CMD_} ${_CMD_}
COMMAND ${PIP_DEPLOY_TOOL} ${_VERB} ${_OPTIONS} -W "\"${CMAKE_OBJDUMP}\"" -P windows,minimal -S windows -q "\"${Qt${_Qt_}_ROOT}\"" -s "\"${CMAKE_PREFIX_PATH}/bin${_dt_delim}${MINGW_BIN}${_add_search_path}${_dt_delim}${MINGW_LIB}\"" -o "${_AGD}" -p "${_AGD}" "\"${_AGD}$<TARGET_FILE_NAME:${_T}>\"" ${_ADD_DEPS} COMMAND ${PIP_DEPLOY_TOOL} ${_VERB} ${_OPTIONS} -W "\"${CMAKE_OBJDUMP}\"" -P windows,minimal -S windows -q "\"${Qt${_Qt_}_ROOT}\"" -s "\"${_search_path}\"" -o "${_AGD}" -p "${_AGD}" "\"${_AGD}$<TARGET_FILE_NAME:${_T}>\"" ${_ADD_DEPS}
# zip # zip
COMMAND cd "\"${_DEPLOY_DIR}\"" "&&" zip -q -r "\"${_DESTINATION}/${_zip_name}\"" "\"${_TV}_win_${MY_ARCH}\"" COMMAND cd "\"${_DEPLOY_DIR}\"" "&&" zip -q -r "\"${_DESTINATION}/${_zip_name}\"" "\"${_TV}_win_${MY_ARCH}\""
COMMENT "Generating ${_zip_name}" COMMENT "Generating ${_zip_name}"
@@ -764,6 +777,11 @@ macro(deploy_target _T)
set(_TARGET_PACKAGE "${_dmg_name}.zip") set(_TARGET_PACKAGE "${_dmg_name}.zip")
endif() endif()
set(_comment "Generating ${_TARGET_PACKAGE}") set(_comment "Generating ${_TARGET_PACKAGE}")
set(_search_path "")
foreach (_c ${CMAKE_PREFIX_PATH})
set(_search_path "${_search_path}${_dt_delim}${_c}/lib")
endforeach()
set(_search_path "${_search_path}${_add_search_path}")
add_custom_target(deploy_${_T} add_custom_target(deploy_${_T}
# gather .app dir # gather .app dir
COMMAND mkdir ${_VERB} -p "${_res_path}" COMMAND mkdir ${_VERB} -p "${_res_path}"
@@ -771,7 +789,7 @@ macro(deploy_target _T)
COMMAND mkdir ${_VERB} -p "${_pli_path}" COMMAND mkdir ${_VERB} -p "${_pli_path}"
COMMAND mkdir ${_VERB} -p "${_DESTINATION}" COMMAND mkdir ${_VERB} -p "${_DESTINATION}"
${_CMD_} ${_CMD_}
COMMAND ${PIP_DEPLOY_TOOL} ${_VERB} ${_OPTIONS} -M "${CMAKE_OTOOL}" -P cocoa,minimal -S mac -q "${Qt5_ROOT}" --qt-conf-dir "${_res_path}" --qt-plugins-dir "${_pli_path}" -s "${CMAKE_PREFIX_PATH}/lib${_add_search_path}" -o "${_lib_path}" "${_bin_path}/${_T}" ${_ADD_DEPS} COMMAND ${PIP_DEPLOY_TOOL} ${_VERB} ${_OPTIONS} -M "${CMAKE_OTOOL}" -P cocoa,minimal -S mac -q "${Qt5_ROOT}" --qt-conf-dir "${_res_path}" --qt-plugins-dir "${_pli_path}" -s "${_search_path}" -o "${_lib_path}" "${_bin_path}/${_T}" ${_ADD_DEPS}
# prepare dmg dir # prepare dmg dir
COMMAND rm -rf "${_DMG}" COMMAND rm -rf "${_DMG}"
COMMAND mkdir ${_VERB} -p "${_DMG}" COMMAND mkdir ${_VERB} -p "${_DMG}"