From 4a861ba893691f9f2f7e195d0fb62b61b47b74a8 Mon Sep 17 00:00:00 2001
From: QxQ <59914293+U-v-U@users.noreply.github.com>
Date: Fri, 18 Sep 2020 00:43:47 +0800
Subject: [PATCH] update: try using Qt:: CMake library alias

---
 CMakeLists.txt                                | 20 +++++++++----------
 cmake/components/qv2ray-platform.cmake        |  2 +-
 cmake/qnodeeditor.cmake                       |  6 +++---
 .../QvPlugin-BuiltinProtocolSupport.cmake     |  2 +-
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6ac577f7..a3c7dcdb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -242,7 +242,7 @@ include(cmake/backend.cmake)
 # ==================================================================================
 find_package(Threads 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)
 set(CMAKE_AUTOMOC ON)
@@ -252,19 +252,19 @@ set(CMAKE_AUTOUIC ON)
 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)
     list(APPEND QV2RAY_QT_LIBS
-        ${QV_QT_LIBNAME}::Quick
-        ${QV_QT_LIBNAME}::Qml
-        ${QV_QT_LIBNAME}::Widgets
-        ${QV_QT_LIBNAME}::Svg
-        ${QV_QT_LIBNAME}::QuickControls2
-        ${QV_QT_LIBNAME}::Gui)
+        Qt::Quick
+        Qt::Qml
+        Qt::Widgets
+        Qt::Svg
+        Qt::QuickControls2
+        Qt::Gui)
     set(_QV2RAY_HAS_GUI_INTERNAL_ ON)
 elseif(QV2RAY_USE_QWIDGET)
     find_package(${QV_QT_LIBNAME} ${QV_QT_MAJOR_VERSION}.${QV_QT_MINOR_VERSION} COMPONENTS Widgets Svg Gui REQUIRED)
     list(APPEND QV2RAY_QT_LIBS
-        ${QV_QT_LIBNAME}::Widgets
-        ${QV_QT_LIBNAME}::Svg
-        ${QV_QT_LIBNAME}::Gui)
+        Qt::Widgets
+        Qt::Svg
+        Qt::Gui)
     set(_QV2RAY_HAS_GUI_INTERNAL_ ON)
 else()
 endif()
diff --git a/cmake/components/qv2ray-platform.cmake b/cmake/components/qv2ray-platform.cmake
index 7c94f004..a4d48918 100644
--- a/cmake/components/qv2ray-platform.cmake
+++ b/cmake/components/qv2ray-platform.cmake
@@ -4,5 +4,5 @@ if(ANDROID)
         ${CMAKE_SOURCE_DIR}/src/platforms/android/QvVPNService.hpp
         ${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()
diff --git a/cmake/qnodeeditor.cmake b/cmake/qnodeeditor.cmake
index f2b2a23c..6ecccaed 100644
--- a/cmake/qnodeeditor.cmake
+++ b/cmake/qnodeeditor.cmake
@@ -74,9 +74,9 @@ if(QV2RAY_QNODEEDITOR_PROVIDER STREQUAL "module")
         ${QNODEEDITOR_INCLUDE_PATH}
         )
     target_link_libraries(${QNODEEDITOR_LIBRARY}
-        ${QV_QT_LIBNAME}::Core
-        ${QV_QT_LIBNAME}::Widgets
-        ${QV_QT_LIBNAME}::Gui
+        Qt::Core
+        Qt::Widgets
+        Qt::Gui
         )
     set(QNODEEDITOR_QRC_RESOURCES ${QNODEEDITOR_DIR}/resources/resources.qrc)
 elseif(QV2RAY_QNODEEDITOR_PROVIDER STREQUAL "package")
diff --git a/src/plugins/protocols/QvPlugin-BuiltinProtocolSupport.cmake b/src/plugins/protocols/QvPlugin-BuiltinProtocolSupport.cmake
index ff3e7d8a..a4f0dcec 100644
--- a/src/plugins/protocols/QvPlugin-BuiltinProtocolSupport.cmake
+++ b/src/plugins/protocols/QvPlugin-BuiltinProtocolSupport.cmake
@@ -68,4 +68,4 @@ else()
     message(FATAL_ERROR "?")
 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)