P35124786
/
notepad--
mirror of https://gitee.com/cxasm/notepad--.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

cmake/platforms: 处理 QSci 被构建为动态库时 Notepad-- 缺少运行时

This commit is contained in:
zinface 2023-02-22 15:26:32 +08:00
parent 4da546af6c
commit e44e49f614
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmake/modules/Notepad--.cmake
View File

@ -26,6 +26,7 @@ if(TRUE)
) )
# target_link_libraries(${PROJECT_NAME} QSci) # target_link_libraries(${PROJECT_NAME} QSci)
target_link_QSci(${PROJECT_NAME}) target_link_QSci(${PROJECT_NAME})
target_link_qt5_PrintSupport(${PROJECT_NAME})
target_link_qt5_XmlPatterns(${PROJECT_NAME}) target_link_qt5_XmlPatterns(${PROJECT_NAME})
endif(TRUE) endif(TRUE)

21
cmake/platforms/windows-deployqt.cmake
View File

@ -23,8 +23,8 @@ if(WINDOWS_DEPLOY_QT)
endif() endif()
if (WINDOWS_DEPLOY_QT5 OR WINDOWS_DEPLOY_QT6) if (WINDOWS_DEPLOY_QT5 OR WINDOWS_DEPLOY_QT6)
message(" -------- ${CMAKE_INSTALL_PREFIX} ---------- ") message("[windows-deployqt.cmake]: find windployqt tool")
message("${WINDOWS_QT_DIR}/../../../bin/windeployqt") message(" ${WINDOWS_QT_DIR}/../../../bin/windeployqt")
# install(TARGETS ${PROJECT_NAME} # install(TARGETS ${PROJECT_NAME}
# DESTINATION ${CMAKE_BINARY_DIR}/windows-deployqt) # DESTINATION ${CMAKE_BINARY_DIR}/windows-deployqt)
@ -48,7 +48,22 @@ if(WINDOWS_DEPLOY_QT)
# LIBRARY_OUTPUT_DIRECTORY "" # LIBRARY_OUTPUT_DIRECTORY ""
# 可执行文件生成目录 # 可执行文件生成目录
RUNTIME_OUTPUT_DIRECTORY ${WINDOWS_APPLICATION_DEPLOY_PATH}) RUNTIME_OUTPUT_DIRECTORY ${WINDOWS_APPLICATION_DEPLOY_PATH})
# 如果 QSci 构建为动态库，那么它生成的位置也应该是与 Notepad-- 输出到同一个位置
# 用于支撑 Notepad-- 的 Debug 运行时
if(NOTEPAD_BUILD_BY_SHARED)
set_target_properties(QSci
PROPERTIES
# 这是一个 WIN32 程序，即可执行文件不再出现黑窗口，转而使用 WinMain(某种 Windows 内部特性)
WIN32_EXECUTABLE true
# 静态库生成目录
# ARCHIVE_OUTPUT_DIRECTORY ""
# 动态库生成目录
# LIBRARY_OUTPUT_DIRECTORY ""
# 可执行文件生成目录
RUNTIME_OUTPUT_DIRECTORY ${WINDOWS_APPLICATION_DEPLOY_PATH})
endif(NOTEPAD_BUILD_BY_SHARED)
# 自动化构建 Windows Deploy Qt Application # 自动化构建 Windows Deploy Qt Application
# 参考: windeployqt --qmldir <path-to-app-qml-files> <path-to-app-binary> # 参考: windeployqt --qmldir <path-to-app-qml-files> <path-to-app-binary>
add_custom_command(TARGET ${PROJECT_NAME} add_custom_command(TARGET ${PROJECT_NAME}