github_mirror
/
cmake-utils
mirror of https://github.com/wangwenx190/cmake-utils.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix 

Signed-off-by: Yuhang Zhao <2546789017@qq.com>
This commit is contained in:
Yuhang Zhao 2023-01-27 16:12:55 +08:00
parent b6f573e08c
commit a1aeec790f
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
utils.cmake
View File

@ -465,7 +465,7 @@ function(deploy_qt_runtime)
message(WARNING "deploy_qt_runtime: Can't locate the QMake executable.") message(WARNING "deploy_qt_runtime: Can't locate the QMake executable.")
return() return()
endif() endif()
get_filename_component(__qt_bin_dir "${QT_QMAKE_EXECUTABLE}" DIRECTORY) cmake_path(GET "${QT_QMAKE_EXECUTABLE}" PARENT_PATH __qt_bin_dir)
find_program(__deploy_tool NAMES windeployqt macdeployqt HINTS "${__qt_bin_dir}") find_program(__deploy_tool NAMES windeployqt macdeployqt HINTS "${__qt_bin_dir}")
if(NOT EXISTS "${__deploy_tool}") if(NOT EXISTS "${__deploy_tool}")
message(WARNING "deploy_qt_runtime: Can't locate the deployqt tool.") message(WARNING "deploy_qt_runtime: Can't locate the deployqt tool.")
@ -553,15 +553,8 @@ function(deploy_qt_runtime)
elseif(UNIX) elseif(UNIX)
# TODO # TODO
endif() endif()
set(__location) get_target_property(__dir ${DEPLOY_ARGS_TARGET} RUNTIME_OUTPUT_DIRECTORY)
get_target_property(__location ${DEPLOY_ARGS_TARGET} LOCATION) file(WRITE "${__dir}/qt.conf" "[Paths]\nPrefix = ..\n")
if(__location)
set(__dir)
cmake_path(GET __location PARENT_PATH __dir)
if(__dir)
file(WRITE "${__dir}/qt.conf" "[Paths]\nPrefix = ..\n")
endif()
endif()
if(NOT DEPLOY_ARGS_NO_INSTALL) if(NOT DEPLOY_ARGS_NO_INSTALL)
include(GNUInstallDirs) include(GNUInstallDirs)
install(TARGETS ${DEPLOY_ARGS_TARGET} install(TARGETS ${DEPLOY_ARGS_TARGET}