Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
40a20763
Commit
40a20763
authored
Jun 30, 2019
by
Tomaz Canabrava
Committed by
Daniel Agar
Jun 30, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Separate CMake Qt Specifics
parent
58fd34c0
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
34 additions
and
34 deletions
+34
-34
CMakeLists.txt
CMakeLists.txt
+1
-34
Qt5QGCConfiguration.cmake
cmake/Qt5QGCConfiguration.cmake
+33
-0
No files found.
CMakeLists.txt
View file @
40a20763
...
...
@@ -18,34 +18,6 @@ if (NOT CMAKE_BUILD_TYPE)
set
(
CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING
"Build type"
FORCE
)
endif
()
if
(
DEFINED ENV{QT_VERSION}
)
set
(
QT_VERSION $ENV{QT_VERSION}
)
endif
()
if
(
NOT QT_VERSION
)
# try Qt 5.12.0 if none specified, last LTS.
set
(
QT_VERSION
"5.12.0"
)
endif
()
if
(
DEFINED ENV{QT_MKSPEC}
)
set
(
QT_MKSPEC $ENV{QT_MKSPEC}
)
endif
()
if
(
UNIX AND NOT APPLE
)
set
(
LINUX TRUE
)
endif
()
if
(
NOT QT_MKSPEC
)
if
(
APPLE
)
set
(
QT_MKSPEC clang_64
)
elseif
(
LINUX
)
set
(
QT_MKSPEC gcc_64
)
elseif
(
WIN32
)
set
(
QT_MKSPEC msvc2017_64
)
#set(QT_MKSPEC winrt_x64_msvc2017)
endif
()
endif
()
# Add folder where are supportive functions
list
(
APPEND CMAKE_MODULE_PATH
${
CMAKE_SOURCE_DIR
}
/cmake
)
...
...
@@ -89,12 +61,7 @@ endif()
#=============================================================================
# Qt5
#
set
(
QT_LIBRARY_HINTS
$ENV{HOME}/Qt/
${
QT_VERSION
}
/
${
QT_MKSPEC
}
$ENV{QT_PATH}/
${
QT_VERSION
}
/
${
QT_MKSPEC
}
C:/Qt
)
include
(
Qt5QGCConfiguration
)
find_package
(
Qt5
${
QT_VERSION
}
COMPONENTS
Bluetooth
...
...
cmake/Qt5QGCConfiguration.cmake
0 → 100644
View file @
40a20763
if
(
DEFINED ENV{QT_VERSION}
)
set
(
QT_VERSION $ENV{QT_VERSION}
)
endif
()
if
(
NOT QT_VERSION
)
# try Qt 5.12.0 if none specified, last LTS.
set
(
QT_VERSION
"5.12.0"
)
endif
()
if
(
DEFINED ENV{QT_MKSPEC}
)
set
(
QT_MKSPEC $ENV{QT_MKSPEC}
)
endif
()
if
(
UNIX AND NOT APPLE
)
set
(
LINUX TRUE
)
endif
()
if
(
NOT QT_MKSPEC
)
if
(
APPLE
)
set
(
QT_MKSPEC clang_64
)
elseif
(
LINUX
)
set
(
QT_MKSPEC gcc_64
)
elseif
(
WIN32
)
set
(
QT_MKSPEC msvc2017_64
)
#set(QT_MKSPEC winrt_x64_msvc2017)
endif
()
endif
()
set
(
QT_LIBRARY_HINTS
$ENV{HOME}/Qt/
${
QT_VERSION
}
/
${
QT_MKSPEC
}
$ENV{QT_PATH}/
${
QT_VERSION
}
/
${
QT_MKSPEC
}
C:/Qt
)
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment