From: Pierre d'Herbemont Date: Tue, 5 Feb 2008 18:07:33 +0000 (+0000) Subject: cmake: Add an option to link or not against libvlc the module. X-Git-Tag: 0.9.0-test0~2891 X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=e55d8a6375b67b53cbf067f205c5bd68de01177f;p=vlc cmake: Add an option to link or not against libvlc the module. --- diff --git a/extras/buildsystem/cmake/include/config.cmake b/extras/buildsystem/cmake/include/config.cmake index b53b7caf01..ee222b4bf9 100644 --- a/extras/buildsystem/cmake/include/config.cmake +++ b/extras/buildsystem/cmake/include/config.cmake @@ -189,6 +189,7 @@ set(COPYRIGHT_YEARS "2001-2007") OPTION( ENABLE_HTTPD "Enable httpd server" ON ) OPTION( ENABLE_VLM "Enable vlm" ON ) OPTION( ENABLE_DYNAMIC_PLUGINS "Enable dynamic plugin" ON ) +OPTION( ENABLE_NO_SYMBOL_CHECK "Don't check symbols of modules against libvlc. (Enabling this option speeds up compilation)" ON ) set( HAVE_DYNAMIC_PLUGINS ${ENABLE_DYNAMIC_PLUGINS}) set( LIBEXT ${CMAKE_SHARED_MODULE_SUFFIX}) diff --git a/extras/buildsystem/cmake/include/vlc_module_funcs.cmake b/extras/buildsystem/cmake/include/vlc_module_funcs.cmake index 554f8d1d19..4d3c44af71 100644 --- a/extras/buildsystem/cmake/include/vlc_module_funcs.cmake +++ b/extras/buildsystem/cmake/include/vlc_module_funcs.cmake @@ -3,7 +3,9 @@ include( ${CMAKE_SOURCE_DIR}/cmake/vlc_add_compile_flag.cmake ) MACRO(vlc_add_module module_name) if(ENABLE_VLC_MODULE_${module_name}) add_library( ${module_name}_plugin MODULE ${ARGN} ) - set(VLC_${module_name}_LINK_LIBRARIES "${VLC_${module_name}_LINK_LIBRARIES};libvlc") + if( NOT ENABLE_NO_SYMBOL_CHECK ) + vlc_module_add_link_libraries( libvlc ) + endif( NOT ENABLE_NO_SYMBOL_CHECK ) set_target_properties( ${module_name}_plugin PROPERTIES COMPILE_FLAGS "-D__PLUGIN__ -DMODULE_NAME=${module_name} -DMODULE_NAME_IS_${module_name} -I${CMAKE_CURRENT_SOURCE_DIR} ${VLC_${module_name}_COMPILE_FLAG}" ) if (VLC_${module_name}_LINK_LIBRARIES)