Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in
Toggle navigation
F
Front-End
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
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
abdullh.alsoleman
Front-End
Commits
145df399
Unverified
Commit
145df399
authored
Aug 05, 2020
by
Marcus Tomlinson
Committed by
GitHub
Aug 05, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Explicitly find and link blkid using pkg-config (#62979)
parent
2939c209
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
0 deletions
+5
-0
linux_doctor.dart
packages/flutter_tools/lib/src/linux/linux_doctor.dart
+1
-0
CMakeLists.txt
...ter_tools/templates/app/linux.tmpl/flutter/CMakeLists.txt
+2
-0
linux_doctor_test.dart
...ter_tools/test/general.shard/linux/linux_doctor_test.dart
+2
-0
No files found.
packages/flutter_tools/lib/src/linux/linux_doctor.dart
View file @
145df399
...
...
@@ -56,6 +56,7 @@ class LinuxDoctorValidator extends DoctorValidator {
'gtk+-3.0'
,
'glib-2.0'
,
'gio-2.0'
,
'blkid'
,
];
@override
...
...
packages/flutter_tools/templates/app/linux.tmpl/flutter/CMakeLists.txt
View file @
145df399
...
...
@@ -24,6 +24,7 @@ find_package(PkgConfig REQUIRED)
pkg_check_modules
(
GTK REQUIRED IMPORTED_TARGET gtk+-3.0
)
pkg_check_modules
(
GLIB REQUIRED IMPORTED_TARGET glib-2.0
)
pkg_check_modules
(
GIO REQUIRED IMPORTED_TARGET gio-2.0
)
pkg_check_modules
(
BLKID REQUIRED IMPORTED_TARGET blkid
)
set
(
FLUTTER_LIBRARY
"
${
EPHEMERAL_DIR
}
/libflutter_linux_gtk.so"
)
...
...
@@ -65,6 +66,7 @@ target_link_libraries(flutter INTERFACE
PkgConfig::GTK
PkgConfig::GLIB
PkgConfig::GIO
PkgConfig::BLKID
)
add_dependencies
(
flutter flutter_assemble
)
...
...
packages/flutter_tools/test/general.shard/linux/linux_doctor_test.dart
View file @
145df399
...
...
@@ -61,6 +61,7 @@ List<FakeCommand> _librariesPresentCommands() {
FakeCommand
(
command:
<
String
>[
'pkg-config'
,
'--exists'
,
'gtk+-3.0'
]),
FakeCommand
(
command:
<
String
>[
'pkg-config'
,
'--exists'
,
'glib-2.0'
]),
FakeCommand
(
command:
<
String
>[
'pkg-config'
,
'--exists'
,
'gio-2.0'
]),
FakeCommand
(
command:
<
String
>[
'pkg-config'
,
'--exists'
,
'blkid'
]),
];
}
...
...
@@ -73,6 +74,7 @@ List<FakeCommand> _librariesMissingCommands() {
exitCode:
1
,
),
FakeCommand
(
command:
<
String
>[
'pkg-config'
,
'--exists'
,
'gio-2.0'
]),
FakeCommand
(
command:
<
String
>[
'pkg-config'
,
'--exists'
,
'blkid'
]),
];
}
...
...
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