fix cmake for Qt6

qgis · Mar 24, 2021 · 0a69331 · 0a69331
1 parent 02691ca
commit 0a69331
Showing 1 changed file with 12 additions and 16 deletions.
diff --git a/src/native/CMakeLists.txt b/src/native/CMakeLists.txt
@@ -10,11 +10,7 @@ endif()
 set(NATIVE_LINK_LIBS)
 
 if(UNIX AND NOT APPLE AND NOT ANDROID)
-  if (WITH_QT6)
-    find_package(Qt6 COMPONENTS DBus REQUIRED)
-  else()
-    find_package(Qt5DBus REQUIRED)
-  endif()
+  find_package(${QT_VERSION_BASE} COMPONENTS DBus REQUIRED)
 endif()
 
 if(APPLE)
@@ -138,28 +134,28 @@ if(NOT ANDROID)
   )
 endif()
 
-target_link_libraries(qgis_native
-    ${Qt5Core_LIBRARIES}
-    ${Qt5Gui_LIBRARIES}
-    "${NATIVE_LINK_LIBS}"
-    )
+if (WITH_QT6)
+  target_link_libraries(qgis_native ${Qt6Core_LIBRARIES} ${Qt6Gui_LIBRARIES} "${NATIVE_LINK_LIBS}")
+else()
+  target_link_libraries(qgis_native ${Qt5Core_LIBRARIES} ${Qt5Gui_LIBRARIES} "${NATIVE_LINK_LIBS}")
+endif()
 
 if (UNIX AND NOT APPLE AND NOT ANDROID)
-  target_link_libraries(qgis_native Qt5::DBus)
+  target_link_libraries(qgis_native ${QT_VERSION_BASE}::DBus)
 endif()
 
 if (APPLE)
-  find_package(Qt5MacExtras)
+  find_package(${QT_VERSION_BASE}MacExtras)
 
-  target_link_libraries(qgis_native Qt5::MacExtras)
+  target_link_libraries(qgis_native ${QT_VERSION_BASE}::MacExtras)
 endif()
 
 if (MSVC)
-  find_package(Qt5WinExtras)
+  find_package(${QT_VERSION_BASE}WinExtras)
 
   target_link_libraries(qgis_native shell32)
-  target_link_libraries(qgis_native ${Qt5Widget_LIBRARIES} ${QT_QTMAIN_LIBRARY})
-  target_link_libraries(qgis_native Qt5::WinExtras)
+  target_link_libraries(qgis_native ${${QT_VERSION_BASE}Widget_LIBRARIES} ${QT_QTMAIN_LIBRARY})
+  target_link_libraries(qgis_native ${QT_VERSION_BASE}::WinExtras)
 endif()
 # install