Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
VLC
Manage
Activity
Members
Labels
Plan
Issues
4k
Issue boards
Milestones
Code
Merge requests
458
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Analyze
Contributor analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
VideoLAN
VLC
Merge requests
!6983
qt: do not probe libatomic twice in meson.build
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
qt: do not probe libatomic twice in meson.build
fuzun/vlc:qt/donotprobelibatomictwice
into
master
Overview
4
Commits
1
Pipelines
5
Changes
1
All threads resolved!
Hide all comments
Merged
Fatih Uzunoğlu
requested to merge
fuzun/vlc:qt/donotprobelibatomictwice
into
master
1 month ago
Overview
4
Commits
1
Pipelines
5
Changes
1
All threads resolved!
Hide all comments
Expand
This seems to be a mistake I made in
55bbcaf9
.
Request review
@chub
.
0
0
Merge request reports
Compare
master
version 2
baed7996
1 month ago
version 1
8abe6c67
1 month ago
master (base)
and
latest version
latest version
3435039a
1 commit,
1 month ago
version 2
baed7996
1 commit,
1 month ago
version 1
8abe6c67
1 commit,
1 month ago
1 file
+
3
−
3
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
modules/gui/qt/meson.build
+
3
−
3
Options
@@ -923,9 +923,9 @@ if qt6_dep.found()
qt_rcc_extra_arguments
+=
'-compress-algo=zlib'
endif
lib
atomic
=
cc
.
find_library
(
'atomic'
,
required
:
false
)
if
lib
atomic
.
found
()
qt_extra_deps
+=
cc
.
find_library
(
'atomic'
,
required
:
false
)
atomic
_lib
=
cc
.
find_library
(
'atomic'
,
required
:
false
)
if
atomic
_lib
.
found
()
qt_extra_deps
+=
atomic_lib
qt_extra_flags
+=
'-DQT_HAS_LIBATOMIC'
endif
Loading