Skip to content

Q
qgroundcontrol
Commit 72fe1186 authored by Tomaz Canabrava's avatar Tomaz Canabrava Committed by Daniel Agar
Browse files
Options

Store the Qt hints in a variable

parent 10c4f416
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 6 deletions
CMakeLists.txt
View file @ 72fe1186
...@@ -89,6 +89,12 @@ endif() ...@@ -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} ...@@ -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") ...@@ -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()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment