Browse Source

Store the Qt hints in a variable

QGC4.4
Tomaz Canabrava 6 years ago committed by Daniel Agar
parent
commit
72fe118694
  1. 14
      CMakeLists.txt

14
CMakeLists.txt

@ -89,6 +89,12 @@ endif()
#============================================================================= #=============================================================================
# Qt5 # Qt5
# #
set(QT_LIBRARY_HINTS
$ENV{HOME}/Qt/${QT_VERSION}/${QT_MKSPEC}
$ENV{QT_PATH}/${QT_VERSION}/${QT_MKSPEC}
C:/Qt
)
find_package(Qt5 ${QT_VERSION} find_package(Qt5 ${QT_VERSION}
COMPONENTS COMPONENTS
Bluetooth Bluetooth
@ -108,9 +114,7 @@ find_package(Qt5 ${QT_VERSION}
Xml Xml
REQUIRED REQUIRED
HINTS HINTS
$ENV{HOME}/Qt/${QT_VERSION}/${QT_MKSPEC} ${QT_LIBRARY_HINTS}
$ENV{QT_PATH}/${QT_VERSION}/${QT_MKSPEC}
C:/Qt
) )
if(NOT QT_MKSPEC MATCHES "winrt") if(NOT QT_MKSPEC MATCHES "winrt")
@ -119,9 +123,7 @@ if(NOT QT_MKSPEC MATCHES "winrt")
SerialPort SerialPort
REQUIRED REQUIRED
HINTS HINTS
$ENV{HOME}/Qt/${QT_VERSION}/${QT_MKSPEC} ${QT_LIBRARY_HINTS}
$ENV{QT_PATH}/${QT_VERSION}/${QT_MKSPEC}
C:/Qt
) )
endif() endif()

Loading…
Cancel
Save