Changeset 4c7600b8e1890352cfe8041cc18e86397bc613f7

Show
Ignore:
Timestamp:
12/02/08 21:36:14 (8 months ago)
Author:
Pierre d'Herbemont <pdherbemont@videolan.org>
git-committer:
Pierre d'Herbemont <pdherbemont@videolan.org> 1202848574 +0000
git-parent:

[44678aacee917f399b83e171a2527cbb2875302f]

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

cmake: Some improvements based on Alexander Neundorf feedback.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • extras/buildsystem/cmake/CMakeLists/src_CMakeLists.txt

    re77ff47 r4c7600b  
    1 include_directories( . ) 
    21 
    32add_definitions(-Dasm=__asm__ -D_INTL_REDIRECT_MACROS) 
     
    87add_executable(vlc vlc.c) 
    98target_link_libraries(vlc libvlc) 
    10  
    11 install_targets(/bin vlc) 
    129 
    1310# libvlc 
     
    133130 
    134131add_library(libvlc SHARED ${SOURCES_libvlc}) 
    135 install_targets(/lib libvlc) 
    136  
    137 set_target_properties(libvlc PROPERTIES OUTPUT_NAME vlc) 
    138 set_target_properties(libvlc PROPERTIES SOVERSION 1) 
    139 set_target_properties(libvlc PROPERTIES VERSION 1.0.0) 
    140  
    141 target_link_libraries(libvlc ${LIBM}) 
    142 target_link_libraries(libvlc ${LIBRT}) 
    143 target_link_libraries(libvlc ${LIBICONV}) 
    144 target_link_libraries(libvlc ${Dlopen_LIBRARIES}) 
     132 
     133set_target_properties(libvlc PROPERTIES 
     134        OUTPUT_NAME vlc 
     135        SOVERSION 1 VERSION 1.0.0) 
     136 
     137target_link_libraries(libvlc ${LIBM} ${LIBRT} ${LIBICONV} ${Dlopen_LIBRARIES}) 
    145138 
    146139 
     
    174167 
    175168add_library(libvlc-control SHARED ${SOURCES_libvlc_control}) 
    176 install_targets(/lib libvlc-control) 
    177169 
    178170set_target_properties(libvlc-control PROPERTIES OUTPUT_NAME vlc-control) 
     
    181173 
    182174target_link_libraries(libvlc-control libvlc) 
     175 
     176########################################################## 
     177# Install 
     178 
     179install(TARGETS libvlc libvlc-control DESTINATION lib) 
     180install(TARGETS vlc DESTINATION bin) 
    183181 
    184182##########################################################