diff --git a/.github/workflows/build-qv2ray-cmake.yml b/.github/workflows/build-qv2ray-cmake.yml index 6acc437e..af4e0b14 100644 --- a/.github/workflows/build-qv2ray-cmake.yml +++ b/.github/workflows/build-qv2ray-cmake.yml @@ -134,7 +134,7 @@ jobs: run: | mkdir 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 --install . # -------------------------------------------------------- diff --git a/cmake/deployment.cmake b/cmake/deployment.cmake index 16f011f4..3d3ab105 100644 --- a/cmake/deployment.cmake +++ b/cmake/deployment.cmake @@ -13,6 +13,12 @@ list(APPEND DIRS "${Qt5Widgets_DIR}/../..") list(APPEND DIRS "/usr/local/lib") list(APPEND DIRS "/usr/lib") +if(MSVC) + if(NOT BUILD_NSIS) + set(CMAKE_INSTALL_SYSTEM_RUNTIME_DESTINATION .) + endif() +endif() + include(InstallRequiredSystemLibraries) 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_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENSE") -if(BUILD_NSIS) - add_definitions(-DQV2RAY_NO_ASIDECONFIG) - if(MSVC) +if(MSVC) + if(BUILD_NSIS) + add_definitions(-DQV2RAY_NO_ASIDECONFIG) set(CPACK_PACKAGE_ICON "${CMAKE_SOURCE_DIR}/assets/icons\\\\qv2ray.ico") set(CPACK_GENERATOR "NSIS") set(CPACK_NSIS_MUI_ICON "${CMAKE_SOURCE_DIR}/assets/icons/qv2ray.ico")