fix macro mismatch

EMBED_TRANSLATIONS -> QV2RAY_EMBED_TRANSLATIONS
linux/window install related
This commit is contained in:
zzndb 2020-09-12 12:05:17 +08:00 committed by QxQ
parent 5d58eae740
commit 2c2fa688b0
2 changed files with 2 additions and 2 deletions

View File

@ -6,6 +6,6 @@ set(QV2RAY_ICON_DIMENSIONS 16 22 32 48 64 128 256 512 1024)
foreach(ICON_DIMENSION ${QV2RAY_ICON_DIMENSIONS}) foreach(ICON_DIMENSION ${QV2RAY_ICON_DIMENSIONS})
install(FILES assets/icons/qv2ray.${ICON_DIMENSION}.png DESTINATION share/icons/hicolor/${ICON_DIMENSION}x${ICON_DIMENSION}/apps RENAME qv2ray.png) install(FILES assets/icons/qv2ray.${ICON_DIMENSION}.png DESTINATION share/icons/hicolor/${ICON_DIMENSION}x${ICON_DIMENSION}/apps RENAME qv2ray.png)
endforeach(ICON_DIMENSION) endforeach(ICON_DIMENSION)
if(NOT EMBED_TRANSLATIONS) if(NOT QV2RAY_EMBED_TRANSLATIONS)
install(FILES ${QM_FILES} DESTINATION share/qv2ray/lang) install(FILES ${QM_FILES} DESTINATION share/qv2ray/lang)
endif() endif()

View File

@ -1,7 +1,7 @@
find_package(OpenSSL REQUIRED) find_package(OpenSSL REQUIRED)
target_link_libraries(qv2ray-baselib wininet wsock32 ws2_32 user32 Iphlpapi OpenSSL::SSL OpenSSL::Crypto Dbghelp) target_link_libraries(qv2ray-baselib wininet wsock32 ws2_32 user32 Iphlpapi OpenSSL::SSL OpenSSL::Crypto Dbghelp)
install(TARGETS qv2ray RUNTIME DESTINATION .) install(TARGETS qv2ray RUNTIME DESTINATION .)
if(NOT EMBED_TRANSLATIONS) if(NOT QV2RAY_EMBED_TRANSLATIONS)
install(FILES ${QM_FILES} DESTINATION lang) install(FILES ${QM_FILES} DESTINATION lang)
endif() endif()
install(DIRECTORY ${CMAKE_BINARY_DIR}/winqt/ DESTINATION .) install(DIRECTORY ${CMAKE_BINARY_DIR}/winqt/ DESTINATION .)