Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
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
Commits
b06b60d4
Commit
b06b60d4
authored
Feb 04, 2008
by
Pierre d'Herbemont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cmake: Don't have modules to depend on libvlc on non-win32 platform.
parent
7c43db68
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
4 deletions
+13
-4
extras/buildsystem/cmake/include/config.cmake
extras/buildsystem/cmake/include/config.cmake
+6
-0
extras/buildsystem/cmake/include/vlc_module_funcs.cmake
extras/buildsystem/cmake/include/vlc_module_funcs.cmake
+7
-4
No files found.
extras/buildsystem/cmake/include/config.cmake
View file @
b06b60d4
...
@@ -94,6 +94,12 @@ include( ${CMAKE_SOURCE_DIR}/cmake/vlc_test_inline.cmake )
...
@@ -94,6 +94,12 @@ include( ${CMAKE_SOURCE_DIR}/cmake/vlc_test_inline.cmake )
if
(
APPLE
)
if
(
APPLE
)
include
(
${
CMAKE_SOURCE_DIR
}
/cmake/vlc_find_frameworks.cmake
)
include
(
${
CMAKE_SOURCE_DIR
}
/cmake/vlc_find_frameworks.cmake
)
set
(
CMAKE_SHARED_MODULE_CREATE_CXX_FLAGS
"
${
CMAKE_SHARED_MODULE_CREATE_CXX_FLAGS
}
-undefined dynamic_lookup"
)
set
(
CMAKE_SHARED_MODULE_CREATE_C_FLAGS
"
${
CMAKE_SHARED_MODULE_CREATE_C_FLAGS
}
-undefined dynamic_lookup"
)
MESSAGE
(
"Using
${
CMAKE_SHARED_MODULE_LINK_C_FLAGS
}
"
)
set
(
HAVE_DL_DYLD ON INTERNAL
)
set
(
HAVE_DL_DYLD ON INTERNAL
)
set
(
SYS_DARWIN 1
)
set
(
SYS_DARWIN 1
)
...
...
extras/buildsystem/cmake/include/vlc_module_funcs.cmake
View file @
b06b60d4
...
@@ -3,11 +3,14 @@ include( ${CMAKE_SOURCE_DIR}/cmake/vlc_add_compile_flag.cmake )
...
@@ -3,11 +3,14 @@ include( ${CMAKE_SOURCE_DIR}/cmake/vlc_add_compile_flag.cmake )
MACRO
(
vlc_add_module module_name
)
MACRO
(
vlc_add_module module_name
)
if
(
ENABLE_VLC_MODULE_
${
module_name
}
)
if
(
ENABLE_VLC_MODULE_
${
module_name
}
)
add_library
(
vlc_
${
module_name
}
MODULE
${
ARGN
}
)
add_library
(
vlc_
${
module_name
}
MODULE
${
ARGN
}
)
set_target_properties
(
vlc_
${
module_name
}
PROPERTIES COMPILE_FLAGS
"-D__PLUGIN__ -DMODULE_NAME=
${
module_name
}
-DMODULE_NAME_IS_
${
module_name
}
-I
${
CMAKE_CURRENT_SOURCE_DIR
}
"
)
# On win32 we need to have all the symbol resolved at link time
if
(
WIN32
)
set
(
VLC_
${
module_name
}
_LINK_LIBRARIES
"VLC_
${
module_name
}
_LINK_LIBRARIES libvlc"
)
endif
(
WIN32
)
set_target_properties
(
vlc_
${
module_name
}
PROPERTIES COMPILE_FLAGS
"-D__PLUGIN__ -DMODULE_NAME=
${
module_name
}
-DMODULE_NAME_IS_
${
module_name
}
-I
${
CMAKE_CURRENT_SOURCE_DIR
}
"
)
if
(
VLC_
${
module_name
}
_LINK_LIBRARIES
)
if
(
VLC_
${
module_name
}
_LINK_LIBRARIES
)
target_link_libraries
(
vlc_
${
module_name
}
libvlc
${
VLC_
${
module_name
}
_LINK_LIBRARIES
}
)
target_link_libraries
(
vlc_
${
module_name
}
${
VLC_
${
module_name
}
_LINK_LIBRARIES
}
)
else
(
VLC_
${
module_name
}
_LINK_LIBRARIES
)
target_link_libraries
(
vlc_
${
module_name
}
libvlc
)
endif
(
VLC_
${
module_name
}
_LINK_LIBRARIES
)
endif
(
VLC_
${
module_name
}
_LINK_LIBRARIES
)
endif
(
ENABLE_VLC_MODULE_
${
module_name
}
)
endif
(
ENABLE_VLC_MODULE_
${
module_name
}
)
ENDMACRO
(
vlc_add_module
)
ENDMACRO
(
vlc_add_module
)
...
...
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