github/Qv2ray
5
0
Fork 0
mirror of https://github.com/Qv2ray/Qv2ray.git synced 2025-05-21 19:30:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix msvc runtime for windows portable package - 2

Browse Source
This commit is contained in:
ymshenyu 2020-04-26 19:12:11 +08:00
parent 2755a3adc4
commit 1261f265af
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/build-qv2ray-cmake.yml vendored
View File

@ -134,7 +134,7 @@ jobs:
run: | run: |
mkdir build mkdir build
cd build cd build
cmake .. -GNinja -DCMAKE_INSTALL_PREFIX=./deployment -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_SYSTEM_RUNTIME_DESTINATION= cmake .. -GNinja -DCMAKE_INSTALL_PREFIX=./deployment -DCMAKE_BUILD_TYPE=Release
cmake --build . --parallel $(nproc) cmake --build . --parallel $(nproc)
cmake --install . cmake --install .
# -------------------------------------------------------- # --------------------------------------------------------

12
cmake/deployment.cmake
View File

@ -13,6 +13,12 @@ list(APPEND DIRS "${Qt5Widgets_DIR}/../..")
list(APPEND DIRS "/usr/local/lib") list(APPEND DIRS "/usr/local/lib")
list(APPEND DIRS "/usr/lib") list(APPEND DIRS "/usr/lib")
if(MSVC)
if(NOT BUILD_NSIS)
set(CMAKE_INSTALL_SYSTEM_RUNTIME_DESTINATION .)
endif()
endif()
include(InstallRequiredSystemLibraries) include(InstallRequiredSystemLibraries)
message(STATUS "APPS: ${APPS}") message(STATUS "APPS: ${APPS}")
@ -30,9 +36,9 @@ set(CPACK_PACKAGE_HOMEPAGE_URL "https://github.com/Qv2ray/Qv2ray")
set(CPACK_PACKAGE_ICON "${CMAKE_SOURCE_DIR}/assets/icons/qv2ray.ico") set(CPACK_PACKAGE_ICON "${CMAKE_SOURCE_DIR}/assets/icons/qv2ray.ico")
set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENSE") set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENSE")
if(BUILD_NSIS) if(MSVC)
add_definitions(-DQV2RAY_NO_ASIDECONFIG) if(BUILD_NSIS)
if(MSVC) add_definitions(-DQV2RAY_NO_ASIDECONFIG)
set(CPACK_PACKAGE_ICON "${CMAKE_SOURCE_DIR}/assets/icons\\\\qv2ray.ico") set(CPACK_PACKAGE_ICON "${CMAKE_SOURCE_DIR}/assets/icons\\\\qv2ray.ico")
set(CPACK_GENERATOR "NSIS") set(CPACK_GENERATOR "NSIS")
set(CPACK_NSIS_MUI_ICON "${CMAKE_SOURCE_DIR}/assets/icons/qv2ray.ico") set(CPACK_NSIS_MUI_ICON "${CMAKE_SOURCE_DIR}/assets/icons/qv2ray.ico")