Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
Suyu
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
many-archive
Suyu
Commits
b848cc5c
There was an error fetching the commit references. Please try again later.
Commit
b848cc5c
authored
3 years ago
by
Morph
Browse files
Options
Downloads
Patches
Plain Diff
CMakeLists: Update to Qt 5.15.2
parent
afee2bc8
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
CMakeLists.txt
+5
-5
5 additions, 5 deletions
CMakeLists.txt
with
5 additions
and
5 deletions
CMakeLists.txt
+
5
−
5
View file @
b848cc5c
...
@@ -237,7 +237,7 @@ yuzu_find_packages()
...
@@ -237,7 +237,7 @@ yuzu_find_packages()
# Qt5 requires that we find components, so it doesn't fit our pretty little find package function
# Qt5 requires that we find components, so it doesn't fit our pretty little find package function
if
(
ENABLE_QT
)
if
(
ENABLE_QT
)
set
(
QT_VERSION 5.1
2
)
set
(
QT_VERSION 5.1
5
)
# We want to load the generated conan qt config so that we get the QT_ROOT var so that we can use the official
# We want to load the generated conan qt config so that we get the QT_ROOT var so that we can use the official
# Qt5Config inside the root folder instead of the conan generated one.
# Qt5Config inside the root folder instead of the conan generated one.
if
(
EXISTS
${
CMAKE_BINARY_DIR
}
/qtConfig.cmake
)
if
(
EXISTS
${
CMAKE_BINARY_DIR
}
/qtConfig.cmake
)
...
@@ -339,8 +339,8 @@ if(ENABLE_QT)
...
@@ -339,8 +339,8 @@ if(ENABLE_QT)
set
(
QT_PREFIX_HINT
)
set
(
QT_PREFIX_HINT
)
if
(
YUZU_USE_BUNDLED_QT
)
if
(
YUZU_USE_BUNDLED_QT
)
if
((
MSVC_VERSION GREATER_EQUAL 19
1
0 AND MSVC_VERSION LESS 19
3
0
)
AND ARCHITECTURE_x86_64
)
if
((
MSVC_VERSION GREATER_EQUAL 19
2
0 AND MSVC_VERSION LESS 19
4
0
)
AND ARCHITECTURE_x86_64
)
set
(
QT_BUILD qt-5.1
2.8
-msvc201
7
_64
)
set
(
QT_BUILD qt-5.1
5.2
-msvc201
9
_64
)
elseif
((
${
CMAKE_SYSTEM_NAME
}
STREQUAL
"Linux"
)
AND NOT MINGW AND ARCHITECTURE_x86_64
)
elseif
((
${
CMAKE_SYSTEM_NAME
}
STREQUAL
"Linux"
)
AND NOT MINGW AND ARCHITECTURE_x86_64
)
set
(
QT_BUILD qt5_5_15_2
)
set
(
QT_BUILD qt5_5_15_2
)
else
()
else
()
...
@@ -369,7 +369,7 @@ endif()
...
@@ -369,7 +369,7 @@ endif()
if
(
ENABLE_SDL2
)
if
(
ENABLE_SDL2
)
if
(
YUZU_USE_BUNDLED_SDL2
)
if
(
YUZU_USE_BUNDLED_SDL2
)
# Detect toolchain and platform
# Detect toolchain and platform
if
((
MSVC_VERSION GREATER_EQUAL 19
1
0 AND MSVC_VERSION LESS 19
3
0
)
AND ARCHITECTURE_x86_64
)
if
((
MSVC_VERSION GREATER_EQUAL 19
2
0 AND MSVC_VERSION LESS 19
4
0
)
AND ARCHITECTURE_x86_64
)
set
(
SDL2_VER
"SDL2-2.0.16"
)
set
(
SDL2_VER
"SDL2-2.0.16"
)
else
()
else
()
message
(
FATAL_ERROR
"No bundled SDL2 binaries for your toolchain. Disable YUZU_USE_BUNDLED_SDL2 and provide your own."
)
message
(
FATAL_ERROR
"No bundled SDL2 binaries for your toolchain. Disable YUZU_USE_BUNDLED_SDL2 and provide your own."
)
...
@@ -462,7 +462,7 @@ if (CONAN_REQUIRED_LIBS)
...
@@ -462,7 +462,7 @@ if (CONAN_REQUIRED_LIBS)
if
(
ENABLE_QT
)
if
(
ENABLE_QT
)
list
(
APPEND CMAKE_MODULE_PATH
"
${
CONAN_QT_ROOT_RELEASE
}
"
)
list
(
APPEND CMAKE_MODULE_PATH
"
${
CONAN_QT_ROOT_RELEASE
}
"
)
list
(
APPEND CMAKE_PREFIX_PATH
"
${
CONAN_QT_ROOT_RELEASE
}
"
)
list
(
APPEND CMAKE_PREFIX_PATH
"
${
CONAN_QT_ROOT_RELEASE
}
"
)
find_package
(
Qt5 5.1
2
REQUIRED COMPONENTS Widgets
)
find_package
(
Qt5 5.1
5
REQUIRED COMPONENTS Widgets
)
if
(
YUZU_USE_QT_WEB_ENGINE
)
if
(
YUZU_USE_QT_WEB_ENGINE
)
find_package
(
Qt5 REQUIRED COMPONENTS WebEngineCore WebEngineWidgets
)
find_package
(
Qt5 REQUIRED COMPONENTS WebEngineCore WebEngineWidgets
)
endif
()
endif
()
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment