Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-1.1
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-1.1
Commits
45141762
Commit
45141762
authored
Jan 19, 2010
by
Rémi Duraffort
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix phonon-vlc compilation and linking.
(not sure that's the best way but that's working well).
parent
2f184dd5
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
2 additions
and
0 deletions
+2
-0
bindings/phonon/CMakeLists.txt
bindings/phonon/CMakeLists.txt
+1
-0
bindings/phonon/cmake/modules/FindVLC.cmake
bindings/phonon/cmake/modules/FindVLC.cmake
+1
-0
bindings/phonon/vlc/CMakeLists.txt
bindings/phonon/vlc/CMakeLists.txt
+0
-0
No files found.
bindings/phonon/CMakeLists.txt
View file @
45141762
...
@@ -30,6 +30,7 @@ find_package(Automoc4 REQUIRED)
...
@@ -30,6 +30,7 @@ find_package(Automoc4 REQUIRED)
include
(
CheckCXXCompilerFlag
)
include
(
CheckCXXCompilerFlag
)
include
(
MacroEnsureVersion
)
include
(
MacroEnsureVersion
)
find_package
(
VLC REQUIRED
)
if
(
NOT AUTOMOC4_VERSION
)
if
(
NOT AUTOMOC4_VERSION
)
set
(
AUTOMOC4_VERSION
"0.9.83"
)
set
(
AUTOMOC4_VERSION
"0.9.83"
)
endif
(
NOT AUTOMOC4_VERSION
)
endif
(
NOT AUTOMOC4_VERSION
)
...
...
bindings/phonon/cmake/modules/FindVLC.cmake
View file @
45141762
...
@@ -25,6 +25,7 @@ if(NOT WIN32)
...
@@ -25,6 +25,7 @@ if(NOT WIN32)
find_package
(
PkgConfig
)
find_package
(
PkgConfig
)
pkg_check_modules
(
VLC libvlc>=1.0.0
)
pkg_check_modules
(
VLC libvlc>=1.0.0
)
set
(
VLC_DEFINITIONS
${
VLC_CFLAGS
}
)
set
(
VLC_DEFINITIONS
${
VLC_CFLAGS
}
)
set
(
VLC_LIBRARIES
${
VLC_LDFLAGS
}
)
endif
(
NOT WIN32
)
endif
(
NOT WIN32
)
# TODO add argument support to pass version on find_package
# TODO add argument support to pass version on find_package
...
...
bindings/phonon/vlc
-kde
/CMakeLists.txt
→
bindings/phonon/vlc/CMakeLists.txt
View file @
45141762
File moved
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