Changeset b06b60d4aa4fd7fe413a938e2a35b579b57fe5b1

Show
Ignore:
Timestamp:
02/04/08 15:00:39 (7 months ago)
Author:
Pierre d'Herbemont <pdherbemont@videolan.org>
git-committer:
Pierre d'Herbemont <pdherbemont@videolan.org> 1202133639 +0000
git-parent:

[7c43db68ea1bb45cb560c32daaea2b8ef76ec4c4]

git-author:
Pierre d'Herbemont <pdherbemont@videolan.org> 1202133639 +0000
Message:

cmake: Don't have modules to depend on libvlc on non-win32 platform.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • extras/buildsystem/cmake/include/config.cmake

    red6e425 rb06b60d  
    9494if(APPLE) 
    9595    include( ${CMAKE_SOURCE_DIR}/cmake/vlc_find_frameworks.cmake ) 
     96 
     97    set(CMAKE_SHARED_MODULE_CREATE_CXX_FLAGS 
     98            "${CMAKE_SHARED_MODULE_CREATE_CXX_FLAGS} -undefined dynamic_lookup") 
     99        set(CMAKE_SHARED_MODULE_CREATE_C_FLAGS 
     100            "${CMAKE_SHARED_MODULE_CREATE_C_FLAGS} -undefined dynamic_lookup") 
     101    MESSAGE( "Using ${CMAKE_SHARED_MODULE_LINK_C_FLAGS}" ) 
    96102 
    97103    set(HAVE_DL_DYLD ON INTERNAL) 

  • extras/buildsystem/cmake/include/vlc_module_funcs.cmake

    red6e425 rb06b60d  
    44    if(ENABLE_VLC_MODULE_${module_name}) 
    55        add_library( vlc_${module_name} MODULE ${ARGN} ) 
    6         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}" ) 
     6       # On win32 we need to have all the symbol resolved at link time 
     7        if(WIN32) 
     8            set(VLC_${module_name}_LINK_LIBRARIES "VLC_${module_name}_LINK_LIBRARIES libvlc") 
     9        endif(WIN32) 
     10        set_target_properties( vlc_${module_name} PROPERTIES COMPILE_FLAGS 
     11                "-D__PLUGIN__ -DMODULE_NAME=${module_name} -DMODULE_NAME_IS_${module_name} -I${CMAKE_CURRENT_SOURCE_DIR}" ) 
    712        if (VLC_${module_name}_LINK_LIBRARIES) 
    8             target_link_libraries( vlc_${module_name} libvlc ${VLC_${module_name}_LINK_LIBRARIES}) 
    9         else (VLC_${module_name}_LINK_LIBRARIES) 
    10             target_link_libraries( vlc_${module_name} libvlc ) 
     13            target_link_libraries( vlc_${module_name} ${VLC_${module_name}_LINK_LIBRARIES}) 
    1114        endif (VLC_${module_name}_LINK_LIBRARIES) 
    1215    endif(ENABLE_VLC_MODULE_${module_name})