link QSerialPort for Qt6 builds

qgis · Jan 25, 2023 · 0b9c447 · 0b9c447
1 parent 81909df
commit 0b9c447
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.docker/docker-qgis-build.sh b/.docker/docker-qgis-build.sh
@@ -112,7 +112,7 @@ cmake \
  -DWITH_SERVER_LANDINGPAGE_WEBAPP=${WITH_QT5} \
  -DWITH_ORACLE=${WITH_QT5} \
  -DWITH_PDAL=ON \
- -DWITH_QT5SERIALPORT=${WITH_QT5} \
+ -DWITH_QT5SERIALPORT=ON \
  -DWITH_QTWEBKIT=${WITH_QT5} \
  -DWITH_OAUTH2_PLUGIN=${WITH_QT5} \
  -DORACLE_INCLUDEDIR=/instantclient_19_9/sdk/include/ \

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -455,11 +455,11 @@ if(WITH_CORE)
   endif()
 
   # Use Qt5SerialPort optionally for GPS
-  set (WITH_QT5SERIALPORT TRUE CACHE BOOL "Determines whether Qt5SerialPort should be tried for GPS positioning")
-  if (WITH_QT5SERIALPORT)
+  set (WITH_QTSERIALPORT TRUE CACHE BOOL "Determines whether Qt5SerialPort should be tried for GPS positioning")
+  if (WITH_QTSERIALPORT)
       find_package(${QT_VERSION_BASE} COMPONENTS SerialPort REQUIRED)
       # following variable is used in qgsconfig.h
-      set (HAVE_QT5SERIALPORT TRUE)
+      set (HAVE_QTSERIALPORT TRUE)
   endif()
 
   find_package(${QT_VERSION_BASE} COMPONENTS Core Gui Widgets Network Xml Svg Concurrent Test Sql Positioning REQUIRED)