Merge pull request #6748 from Scimmia22/patch-1

Update FindQextserialport.cmake for Qt5
qgis · May 7, 2018 · 0cc0fed · 0cc0fed
2 parents dd2eb3a + 293c56c
commit 0cc0fed
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/cmake/FindQextserialport.cmake b/cmake/FindQextserialport.cmake
@@ -18,10 +18,10 @@ FIND_PATH(QEXTSERIALPORT_INCLUDE_DIR NAMES qextserialport.h PATHS
   /usr/local/include
   "$ENV{LIB_DIR}/include"
   "$ENV{INCLUDE}"
-  PATH_SUFFIXES QtExtSerialPort
+  PATH_SUFFIXES QtExtSerialPort qt/QtExtSerialPort
   )
 
-FIND_LIBRARY(QEXTSERIALPORT_LIBRARY NAMES qextserialport-1.2 PATHS
+FIND_LIBRARY(QEXTSERIALPORT_LIBRARY NAMES Qt5ExtSerialPort PATHS
   /usr/lib
   /usr/local/lib
   "$ENV{LIB_DIR}/lib"