Changeset f569b51c1aeb39d44c2b21c1e2f7e97701966b8e

Show
Ignore:
Timestamp:
18/05/08 16:20:29 (5 months ago)
Author:
Rafaël Carré <funman@videolan.org>
git-committer:
Rafaël Carré <funman@videolan.org> 1211120429 +0200
git-parent:

[597e23cadf0ad4c2ae4e0a0584a1f5307447f866]

git-author:
Rafaël Carré <funman@videolan.org> 1211120429 +0200
Message:

cmake: fix src/ building

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • extras/buildsystem/cmake/CMakeLists/src_CMakeLists.txt

    r025edf9 rf569b51  
    22add_definitions(-Dasm=__asm__ -D_INTL_REDIRECT_MACROS) 
    33add_definitions(-DLOCALEDIR="${CMAKE_INSTALL_PREFIX}/locale") 
     4add_definitions(-DSYSCONFDIR="${CMAKE_INSTALL_PREFIX}/etc") 
    45add_definitions(-DPLUGIN_PATH="${CMAKE_INSTALL_PREFIX}/lib/vlc") 
    56add_definitions(-DDATA_PATH="${CMAKE_INSTALL_PREFIX}/share/vlc") 
    …… 
    78# vlc 
    89add_executable(vlc vlc.c) 
    9 target_link_libraries(vlc libvlc) 
    10  
    11 # libvlc 
    12  
    13 set( SOURCES_libvlc_beos misc/beos_specific.cpp ) 
    14 set( SOURCES_libvlc_darwin misc/darwin_specific.c ) 
    15 set( SOURCES_libvlc_win32 misc/win32_specific.c ) 
    16 set( SOURCES_libvlc_dirent extras/dirent.c ) 
    17 set( SOURCES_libvlc_getopt misc/getopt.c misc/getopt.h misc/getopt1.c ) 
    18 set( SOURCES_libvlc_common 
     10target_link_libraries(vlc libvlccore general libvlc) 
     11 
     12# libvlccore 
     13 
     14set( SOURCES_libvlccore_beos misc/beos_specific.cpp ) 
     15set( SOURCES_libvlccore_darwin misc/darwin_specific.c ) 
     16set( SOURCES_libvlccore_win32 misc/win32_specific.c ) 
     17set( SOURCES_libvlccore_linux misc/linux_specific.c ) 
     18set( SOURCES_libvlccore_other misc/not_specific.c ) 
     19set( SOURCES_libvlccore_dirent extras/dirent.c ) 
     20set( SOURCES_libvlccore_getopt misc/getopt.c misc/getopt.h misc/getopt1.c ) 
     21set( SOURCES_libvlccore_common 
    1922    libvlc.c 
    2023    libvlc-common.c 
    …… 
    119122    ${CMAKE_BINARY_DIR}/src/misc/revision.c 
    120123    input/vlm.c 
     124    input/vlmshell.c 
    121125    misc/xml.c 
    122126    misc/devices.c 
    …… 
    124128    ${CMAKE_BINARY_DIR}/include/vlc_about.h ) 
    125129 
    126 set( SOURCES_libvlc ${SOURCES_libvlc_common} ) 
     130set( SOURCES_libvlccore ${SOURCES_libvlccore_common} ) 
    127131 
    128132if(SYS_DARWIN) 
    129     set( SOURCES_libvlc ${SOURCES_libvlc} ${SOURCES_libvlc_darwin} ) 
     133    set( SOURCES_libvlccore ${SOURCES_libvlccore} ${SOURCES_libvlccore_darwin} ) 
     134elseif(SYS_BEOS) 
     135    set( SOURCES_libvlccore ${SOURCES_libvlccore} ${SOURCES_libvlccore_beos} ) 
     136elseif(SYS_WIN32) 
     137    set( SOURCES_libvlccore ${SOURCES_libvlccore} ${SOURCES_libvlccore_win32} ) 
     138elseif(SYS_LINUX) 
     139    set( SOURCES_libvlccore ${SOURCES_libvlccore} ${SOURCES_libvlccore_linux} ) 
     140else(SYS_DARWIN) 
     141    set( SOURCES_libvlccore ${SOURCES_libvlccore} ${SOURCES_libvlccore_other} ) 
    130142endif(SYS_DARWIN) 
    131143 
    132 add_library(libvlc SHARED ${SOURCES_libvlc}) 
    133  
    134 set_target_properties(libvlc PROPERTIES 
     144 
     145add_library(libvlccore SHARED ${SOURCES_libvlccore}) 
     146 
     147set_target_properties(libvlccore PROPERTIES 
    135148        OUTPUT_NAME vlc 
    136149        SOVERSION 1 VERSION 1.0.0) 
    137150 
    138151if(UPDATE_CHECK) 
    139 target_link_libraries(libvlc ${LIBM} ${LIBRT} ${LIBICONV} ${Dlopen_LIBRARIES} "-lgcrypt") 
     152target_link_libraries(libvlccore ${LIBM} ${LIBRT} ${LIBICONV} ${Dlopen_LIBRARIES} "-lgcrypt") 
    140153else(UPDATE_CHECK) 
    141 target_link_libraries(libvlc ${LIBM} ${LIBRT} ${LIBICONV} ${Dlopen_LIBRARIES}) 
     154target_link_libraries(libvlccore ${LIBM} ${LIBRT} ${LIBICONV} ${Dlopen_LIBRARIES}) 
    142155endif(UPDATE_CHECK) 
    143156 
    144 # libvlc-control 
    145 set( SOURCES_libvlc_control 
     157# libvlc 
     158set( SOURCES_libvlc 
    146159     control/libvlc_internal.h 
    147160     control/core.c 
    …… 
    168181     control/media_discoverer.c ) 
    169182 
    170 add_library(libvlc-control SHARED ${SOURCES_libvlc_control}) 
    171  
    172 set_target_properties(libvlc-control PROPERTIES OUTPUT_NAME vlc-control) 
    173 set_target_properties(libvlc-control PROPERTIES SOVERSION 0) 
    174 set_target_properties(libvlc PROPERTIES VERSION 0.0.0) 
    175  
    176 target_link_libraries(libvlc-control libvlc) 
     183add_library(libvlc SHARED ${SOURCES_libvlc}) 
     184 
     185set_target_properties(libvlc PROPERTIES OUTPUT_NAME vlc) 
     186set_target_properties(libvlc PROPERTIES SOVERSION 0) 
     187set_target_properties(libvlccore PROPERTIES VERSION 0.0.0) 
     188 
     189set_source_files_properties(${SOURCES_libvlc} PROPERTIES COMPILE_FLAGS -DMODULE_STRING=\\"control\\") 
     190set_source_files_properties(${SOURCES_libvlccore} PROPERTIES COMPILE_FLAGS -DMODULE_STRING=\\"main\\") 
     191 
     192target_link_libraries(libvlc libvlccore) 
    177193 
    178194########################################################## 
    179195# Install 
    180196 
    181 install(TARGETS libvlc libvlc-control DESTINATION lib) 
     197install(TARGETS libvlccore libvlc DESTINATION lib) 
    182198install(TARGETS vlc DESTINATION bin) 
    183199 
    …… 
    188204if(APPLE) 
    189205  find_library(CARBON_FRAMEWORK Carbon) 
    190   target_link_libraries(libvlc ${CARBON_FRAMEWORK}) 
     206  target_link_libraries(libvlccore ${CARBON_FRAMEWORK}) 
    191207endif(APPLE) 
    192208 
    …… 
    203219COMMAND    sh -c "echo '/* AUTOGENERATED FILE - DO NOT EDIT */' > ${rev}.tmp" 
    204220COMMAND    sh -c "printf 'const char psz_vlc_changeset[] = \"' >> ${rev}.tmp" 
    205 COMMAND    sh -c "printf `LANG=C svnversion ${CMAKE_SOURCE_DIR} || printf \"exported\"` >> ${rev}.tmp" 
     221COMMAND    sh -c "printf `LANG=C git --git-dir=${CMAKE_SOURCE_DIR}/.git show-ref -s HEAD 2>/dev/null || printf exported` >> ${rev}.tmp" 
    206222COMMAND    sh -c "echo '\";' >> ${rev}.tmp" 
    207223COMMAND    mv -f ${rev}.tmp ${rev} 
    …… 
    257273 
    258274# FIXME: Should probably be autodetected in configure? 
    259 if(NOT APPLE) 
    260    set(LINK_FLAGS "-z defs --as-needed") 
    261 endif(NOT APPLE) 
    262  
     275# FIXME: This breaks on FreeBSD also 
     276#if(NOT APPLE) 
     277#   set(LINK_FLAGS "-z defs --as-needed") 
     278#endif(NOT APPLE) 
     279 
     280target_link_libraries(libvlccore "${CMAKE_THREAD_LIBS_INIT}") 
    263281target_link_libraries(libvlc "${CMAKE_THREAD_LIBS_INIT}") 
    264 target_link_libraries(libvlc-control "${CMAKE_THREAD_LIBS_INIT}") 
    265  
    266 set_target_properties(libvlc libvlc-control vlc PROPERTIES COMPILE_FLAGS 
     282 
     283set_target_properties(libvlccore libvlc vlc PROPERTIES COMPILE_FLAGS 
    267284    "-Wall -Wextra -Wsign-compare -Wundef -Wpointer-arith -Wbad-function-cast -Wcast-align -Wwrite-strings -Wmissing-prototypes -I${CMAKE_BINARY_DIR}/src -I${CMAKE_BINARY_DIR}/include" ) 
    268285 
    …… 
    275292add_executable(test_dictionary test/dictionary.c) 
    276293 
    277 target_link_libraries(test_i18n_atof  libvlc) 
    278 target_link_libraries(test_url        libvlc) 
    279 target_link_libraries(test_utf8       libvlc) 
    280 target_link_libraries(test_dictionary libvlc) 
     294target_link_libraries(test_i18n_atof  libvlccore) 
     295target_link_libraries(test_url        libvlccore) 
     296target_link_libraries(test_utf8       libvlccore) 
     297target_link_libraries(test_dictionary libvlccore) 
    281298 
    282299add_test(test_i18n_atof  ${CMAKE_CURRENT_BINARY_DIR}/test_i18n_atof)