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

update: try using Qt:: CMake library alias

Browse Source
This commit is contained in:
QxQ 2020-09-18 00:43:47 +08:00
parent 340a63979c
commit 4a861ba893
4 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
CMakeLists.txt
View File

@ -242,7 +242,7 @@ include(cmake/backend.cmake)
# ================================================================================== # ==================================================================================
find_package(Threads REQUIRED) find_package(Threads REQUIRED)
find_package(${QV_QT_LIBNAME} ${QV_QT_MAJOR_VERSION}.${QV_QT_MINOR_VERSION} COMPONENTS Core Network REQUIRED) find_package(${QV_QT_LIBNAME} ${QV_QT_MAJOR_VERSION}.${QV_QT_MINOR_VERSION} COMPONENTS Core Network REQUIRED)
list(APPEND QV2RAY_QT_LIBS ${QV_QT_LIBNAME}::Core ${QV_QT_LIBNAME}::Network) list(APPEND QV2RAY_QT_LIBS Qt::Core Qt::Network)
cmake_policy(SET CMP0071 NEW) cmake_policy(SET CMP0071 NEW)
set(CMAKE_AUTOMOC ON) set(CMAKE_AUTOMOC ON)
@ -252,19 +252,19 @@ set(CMAKE_AUTOUIC ON)
if(QV2RAY_USE_QML) if(QV2RAY_USE_QML)
find_package(${QV_QT_LIBNAME} ${QV_QT_MAJOR_VERSION}.${QV_QT_MINOR_VERSION} COMPONENTS Qml Quick Widgets Svg QuickControls2 Gui REQUIRED) find_package(${QV_QT_LIBNAME} ${QV_QT_MAJOR_VERSION}.${QV_QT_MINOR_VERSION} COMPONENTS Qml Quick Widgets Svg QuickControls2 Gui REQUIRED)
list(APPEND QV2RAY_QT_LIBS list(APPEND QV2RAY_QT_LIBS
${QV_QT_LIBNAME}::Quick Qt::Quick
${QV_QT_LIBNAME}::Qml Qt::Qml
${QV_QT_LIBNAME}::Widgets Qt::Widgets
${QV_QT_LIBNAME}::Svg Qt::Svg
${QV_QT_LIBNAME}::QuickControls2 Qt::QuickControls2
${QV_QT_LIBNAME}::Gui) Qt::Gui)
set(_QV2RAY_HAS_GUI_INTERNAL_ ON) set(_QV2RAY_HAS_GUI_INTERNAL_ ON)
elseif(QV2RAY_USE_QWIDGET) elseif(QV2RAY_USE_QWIDGET)
find_package(${QV_QT_LIBNAME} ${QV_QT_MAJOR_VERSION}.${QV_QT_MINOR_VERSION} COMPONENTS Widgets Svg Gui REQUIRED) find_package(${QV_QT_LIBNAME} ${QV_QT_MAJOR_VERSION}.${QV_QT_MINOR_VERSION} COMPONENTS Widgets Svg Gui REQUIRED)
list(APPEND QV2RAY_QT_LIBS list(APPEND QV2RAY_QT_LIBS
${QV_QT_LIBNAME}::Widgets Qt::Widgets
${QV_QT_LIBNAME}::Svg Qt::Svg
${QV_QT_LIBNAME}::Gui) Qt::Gui)
set(_QV2RAY_HAS_GUI_INTERNAL_ ON) set(_QV2RAY_HAS_GUI_INTERNAL_ ON)
else() else()
endif() endif()

2
cmake/components/qv2ray-platform.cmake
View File

@ -4,5 +4,5 @@ if(ANDROID)
${CMAKE_SOURCE_DIR}/src/platforms/android/QvVPNService.hpp ${CMAKE_SOURCE_DIR}/src/platforms/android/QvVPNService.hpp
${CMAKE_SOURCE_DIR}/src/platforms/android/QvVPNService.cpp ${CMAKE_SOURCE_DIR}/src/platforms/android/QvVPNService.cpp
) )
list(APPEND QV2RAY_PLATFORM_LIBS ${QV_QT_LIBNAME}::AndroidExtras -llog -landroid) list(APPEND QV2RAY_PLATFORM_LIBS Qt::AndroidExtras -llog -landroid)
endif() endif()

6
cmake/qnodeeditor.cmake
View File

@ -74,9 +74,9 @@ if(QV2RAY_QNODEEDITOR_PROVIDER STREQUAL "module")
${QNODEEDITOR_INCLUDE_PATH} ${QNODEEDITOR_INCLUDE_PATH}
) )
target_link_libraries(${QNODEEDITOR_LIBRARY} target_link_libraries(${QNODEEDITOR_LIBRARY}
${QV_QT_LIBNAME}::Core Qt::Core
${QV_QT_LIBNAME}::Widgets Qt::Widgets
${QV_QT_LIBNAME}::Gui Qt::Gui
) )
set(QNODEEDITOR_QRC_RESOURCES ${QNODEEDITOR_DIR}/resources/resources.qrc) set(QNODEEDITOR_QRC_RESOURCES ${QNODEEDITOR_DIR}/resources/resources.qrc)
elseif(QV2RAY_QNODEEDITOR_PROVIDER STREQUAL "package") elseif(QV2RAY_QNODEEDITOR_PROVIDER STREQUAL "package")

2
src/plugins/protocols/QvPlugin-BuiltinProtocolSupport.cmake
View File

@ -68,4 +68,4 @@ else()
message(FATAL_ERROR "?") message(FATAL_ERROR "?")
endif() endif()
target_link_libraries(${BUILT_IN_PROTOCOL_PLUGIN_TARGET} ${QV_QT_LIBNAME}::Core ${QV_QT_LIBNAME}::Gui ${QV_QT_LIBNAME}::Widgets) target_link_libraries(${BUILT_IN_PROTOCOL_PLUGIN_TARGET} Qt::Core Qt::Gui Qt::Widgets)