Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
OpenFlipper-Free
OpenFlipper
Commits
42df1069
Commit
42df1069
authored
Jun 12, 2017
by
Jan Möbius
Browse files
Merge branch 'featureFindQtEasy' into 'master'
Feature find qt easy See merge request
!21
parents
a2e93c36
a36d3978
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
44 additions
and
36 deletions
+44
-36
cmake/ACGQt.cmake
cmake/ACGQt.cmake
+42
-34
cmake/CMakeLists.txt
cmake/CMakeLists.txt
+2
-2
No files found.
cmake/ACGQt.cmake
View file @
42df1069
...
...
@@ -28,9 +28,17 @@ macro (acg_qt5)
set
(
QT5_INSTALL_PATH_EXISTS TRUE
)
endif
()
find_package
(
Qt5Core QUIET
)
set
(
QT5_FINDER_FLAGS
""
CACHE STRING
"Flags for the Qt finder e.g.
NO_DEFAULT_PATH if no system installed Qt shall be found"
)
# compute default search paths
set
(
SUPPORTED_QT_VERSIONS 5.9 5.8 5.7 5.6
)
foreach
(
suffix gcc_64 clang_64
)
foreach
(
version
${
SUPPORTED_QT_VERSIONS
}
)
list
(
APPEND QT_DEFAULT_PATH
"~/sw/Qt/
${
version
}
/
${
suffix
}
"
)
endforeach
()
endforeach
()
find_package
(
Qt5Core PATHS
${
QT_DEFAULT_PATH
}
${
QT5_FINDER_FLAGS
}
)
if
(
Qt5Core_FOUND
)
if
(
Qt5Core_VERSION
)
# use the new version variable if it is set
set
(
Qt5Core_VERSION_STRING
${
Qt5Core_VERSION
}
)
...
...
@@ -55,41 +63,41 @@ macro (acg_qt5)
#do noot look for Webkit and qt declarative on qt version 5.6 or newer
if
(
${
QT_VERSION_MINOR
}
GREATER 5
)
find_package
(
Qt5Widgets QUIET
)
find_package
(
Qt5Gui QUIET
)
find_package
(
Qt5OpenGL QUIET
)
find_package
(
Qt5Network QUIET
)
find_package
(
Qt5Script QUIET
)
find_package
(
Qt5ScriptTools QUIET
)
find_package
(
Qt5Sql QUIET
)
find_package
(
Qt5Xml QUIET
)
find_package
(
Qt5XmlPatterns QUIET
)
find_package
(
Qt5Help QUIET
)
find_package
(
Qt5UiTools QUIET
)
find_package
(
Qt5Concurrent QUIET
)
find_package
(
Qt5PrintSupport QUIET
)
find_package
(
Qt5Svg QUIET
)
find_package
(
Qt5Widgets QUIET
PATHS
${
QT_DEFAULT_PATH
}
${
QT5_FINDER_FLAGS
}
)
find_package
(
Qt5Gui QUIET
PATHS
${
QT_DEFAULT_PATH
}
${
QT5_FINDER_FLAGS
}
)
find_package
(
Qt5OpenGL QUIET
PATHS
${
QT_DEFAULT_PATH
}
${
QT5_FINDER_FLAGS
}
)
find_package
(
Qt5Network QUIET
PATHS
${
QT_DEFAULT_PATH
}
${
QT5_FINDER_FLAGS
}
)
find_package
(
Qt5Script QUIET
PATHS
${
QT_DEFAULT_PATH
}
${
QT5_FINDER_FLAGS
}
)
find_package
(
Qt5ScriptTools QUIET
PATHS
${
QT_DEFAULT_PATH
}
${
QT5_FINDER_FLAGS
}
)
find_package
(
Qt5Sql QUIET
PATHS
${
QT_DEFAULT_PATH
}
${
QT5_FINDER_FLAGS
}
)
find_package
(
Qt5Xml QUIET
PATHS
${
QT_DEFAULT_PATH
}
${
QT5_FINDER_FLAGS
}
)
find_package
(
Qt5XmlPatterns QUIET
PATHS
${
QT_DEFAULT_PATH
}
${
QT5_FINDER_FLAGS
}
)
find_package
(
Qt5Help QUIET
PATHS
${
QT_DEFAULT_PATH
}
${
QT5_FINDER_FLAGS
}
)
find_package
(
Qt5UiTools QUIET
PATHS
${
QT_DEFAULT_PATH
}
${
QT5_FINDER_FLAGS
}
)
find_package
(
Qt5Concurrent QUIET
PATHS
${
QT_DEFAULT_PATH
}
${
QT5_FINDER_FLAGS
}
)
find_package
(
Qt5PrintSupport QUIET
PATHS
${
QT_DEFAULT_PATH
}
${
QT5_FINDER_FLAGS
}
)
find_package
(
Qt5Svg QUIET
PATHS
${
QT_DEFAULT_PATH
}
${
QT5_FINDER_FLAGS
}
)
else
(
${
QT_VERSION_MINOR
}
GREATER 5
)
find_package
(
Qt5Declarative QUIET
)
find_package
(
Qt5Widgets QUIET
)
find_package
(
Qt5Gui QUIET
)
find_package
(
Qt5OpenGL QUIET
)
find_package
(
Qt5Network QUIET
)
find_package
(
Qt5Script QUIET
)
find_package
(
Qt5ScriptTools QUIET
)
find_package
(
Qt5Sql QUIET
)
find_package
(
Qt5Xml QUIET
)
find_package
(
Qt5XmlPatterns QUIET
)
find_package
(
Qt5Help QUIET
)
find_package
(
Qt5WebKit QUIET
)
find_package
(
Qt5UiTools QUIET
)
find_package
(
Qt5Concurrent QUIET
)
find_package
(
Qt5PrintSupport QUIET
)
find_package
(
Qt5Svg QUIET
)
find_package
(
Qt5Declarative QUIET
PATHS
${
QT_DEFAULT_PATH
}
${
QT5_FINDER_FLAGS
}
)
find_package
(
Qt5Widgets QUIET
PATHS
${
QT_DEFAULT_PATH
}
${
QT5_FINDER_FLAGS
}
)
find_package
(
Qt5Gui QUIET
PATHS
${
QT_DEFAULT_PATH
}
${
QT5_FINDER_FLAGS
}
)
find_package
(
Qt5OpenGL QUIET
PATHS
${
QT_DEFAULT_PATH
}
${
QT5_FINDER_FLAGS
}
)
find_package
(
Qt5Network QUIET
PATHS
${
QT_DEFAULT_PATH
}
${
QT5_FINDER_FLAGS
}
)
find_package
(
Qt5Script QUIET
PATHS
${
QT_DEFAULT_PATH
}
${
QT5_FINDER_FLAGS
}
)
find_package
(
Qt5ScriptTools QUIET
PATHS
${
QT_DEFAULT_PATH
}
${
QT5_FINDER_FLAGS
}
)
find_package
(
Qt5Sql QUIET
PATHS
${
QT_DEFAULT_PATH
}
${
QT5_FINDER_FLAGS
}
)
find_package
(
Qt5Xml QUIET
PATHS
${
QT_DEFAULT_PATH
}
${
QT5_FINDER_FLAGS
}
)
find_package
(
Qt5XmlPatterns QUIET
PATHS
${
QT_DEFAULT_PATH
}
${
QT5_FINDER_FLAGS
}
)
find_package
(
Qt5Help QUIET
PATHS
${
QT_DEFAULT_PATH
}
${
QT5_FINDER_FLAGS
}
)
find_package
(
Qt5WebKit QUIET
PATHS
${
QT_DEFAULT_PATH
}
${
QT5_FINDER_FLAGS
}
)
find_package
(
Qt5UiTools QUIET
PATHS
${
QT_DEFAULT_PATH
}
${
QT5_FINDER_FLAGS
}
)
find_package
(
Qt5Concurrent QUIET
PATHS
${
QT_DEFAULT_PATH
}
${
QT5_FINDER_FLAGS
}
)
find_package
(
Qt5PrintSupport QUIET
PATHS
${
QT_DEFAULT_PATH
}
${
QT5_FINDER_FLAGS
}
)
find_package
(
Qt5Svg QUIET
PATHS
${
QT_DEFAULT_PATH
}
${
QT5_FINDER_FLAGS
}
)
endif
(
${
QT_VERSION_MINOR
}
GREATER 5
)
if
(
NOT WIN32 AND NOT APPLE
)
find_package
(
Qt5X11Extras QUIET
)
find_package
(
Qt5X11Extras QUIET
PATHS
${
QT_DEFAULT_PATH
}
${
QT5_FINDER_FLAGS
}
)
endif
()
if
(
${
QT_VERSION_MINOR
}
GREATER 5
)
...
...
cmake/CMakeLists.txt
View file @
42df1069
...
...
@@ -20,9 +20,9 @@ set( CMAKE_CXX_STANDARD 11 )
# ACG Environment default settings
# This is ugly but currently we need to work around the default installed 5.3 on debian
if
(
EXISTS /ACG/acgdev/gcc-x86_64/qt-5.
8
.0/5.
8
/gcc_64/
)
if
(
EXISTS /ACG/acgdev/gcc-x86_64/qt-5.
9
.0/5.
9
/gcc_64/
)
# Default to this install path for QT%_INSTALL_DIR
set
(
QT5_INSTALL_PATH /ACG/acgdev/gcc-x86_64/qt-5.
8
.0/5.
8
/gcc_64/ CACHE PATH
"Qt5 install path set for ACG environment"
)
set
(
QT5_INSTALL_PATH /ACG/acgdev/gcc-x86_64/qt-5.
9
.0/5.
9
/gcc_64/ CACHE PATH
"Qt5 install path set for ACG environment"
)
endif
()
if
(
WIN32
)
...
...
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
