Changeset 467


Ignore:
Timestamp:
08/21/10 18:55:01 (14 years ago)
Author:
r2d
Message:

libmpc : renamed libmpcdec project libmpcdec and mpcdec project mpcdec_cmd to have correctly named outputs and make cmake don't cry

Location:
libmpc/trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • libmpc/trunk/libmpcdec/CMakeLists.txt

    r459 r467  
    11include_directories(${libmpc_SOURCE_DIR}/include)
    22if(SHARED)
    3   add_library(mpcdec_shared SHARED huffman mpc_decoder mpc_reader streaminfo mpc_bits_reader mpc_demux requant synth_filter ${libmpc_SOURCE_DIR}/common/crc32)
     3  add_library(mpcdec SHARED huffman mpc_decoder mpc_reader streaminfo mpc_bits_reader mpc_demux requant synth_filter ${libmpc_SOURCE_DIR}/common/crc32)
    44else(SHARED)
    55  add_library(mpcdec_static STATIC huffman mpc_decoder mpc_reader streaminfo mpc_bits_reader mpc_demux requant synth_filter ${libmpc_SOURCE_DIR}/common/crc32)

  • libmpc/trunk/mpc2sv8/CMakeLists.txt

    r460 r467  
    1414
    1515if(SHARED)
    16   target_link_libraries(mpc2sv8 mpcdec_shared)
     16  target_link_libraries(mpc2sv8 mpcdec)
    1717else(SHARED)
    1818  target_link_libraries(mpc2sv8 mpcdec_static)

  • libmpc/trunk/mpcchap/CMakeLists.txt

    r460 r467  
    1616
    1717if(SHARED)
    18   target_link_libraries(mpcchap mpcdec_shared)
     18  target_link_libraries(mpcchap mpcdec)
    1919else(SHARED)
    2020  target_link_libraries(mpcchap mpcdec_static)

  • libmpc/trunk/mpccut/CMakeLists.txt

    r460 r467  
    1414
    1515if(SHARED)
    16   target_link_libraries(mpccut mpcdec_shared)
     16  target_link_libraries(mpccut mpcdec)
    1717else(SHARED)
    1818  target_link_libraries(mpccut mpcdec_static)

  • libmpc/trunk/mpcdec/CMakeLists.txt

    r460 r467  
    88if(MSVC)
    99include_directories(${libmpc_SOURCE_DIR}/win32)
    10 add_executable(mpcdec mpcdec ${libmpc_SOURCE_DIR}/win32/attgetopt)
     10add_executable(mpcdec_cmd mpcdec.c ${libmpc_SOURCE_DIR}/win32/attgetopt)
    1111endif(MSVC)
    1212
    13 add_executable(mpcdec mpcdec.c)
     13add_executable(mpcdec_cmd mpcdec.c)
    1414
    1515if(NOT MSVC)
    16 target_link_libraries(mpcdec m)
     16target_link_libraries(mpcdec_cmd m)
    1717endif(NOT MSVC)
    1818
    19 target_link_libraries(mpcdec wavformat_static)
     19target_link_libraries(mpcdec_cmd wavformat_static)
    2020
    2121if(SHARED)
    22   target_link_libraries(mpcdec mpcdec_shared)
     22  target_link_libraries(mpcdec_cmd mpcdec)
    2323else(SHARED)
    24   target_link_libraries(mpcdec mpcdec_static)
     24  target_link_libraries(mpcdec_cmd mpcdec_static)
    2525endif(SHARED)
    2626
    27 install(TARGETS mpcdec RUNTIME DESTINATION bin)
     27SET_TARGET_PROPERTIES(mpcdec_cmd PROPERTIES OUTPUT_NAME "mpcdec")
     28
     29install(TARGETS mpcdec_cmd RUNTIME DESTINATION bin)

  • libmpc/trunk/mpcgain/CMakeLists.txt

    r450 r467  
    2121
    2222if(SHARED)
    23   target_link_libraries(mpcgain mpcdec_shared)
     23  target_link_libraries(mpcgain mpcdec)
    2424else(SHARED)
    2525  target_link_libraries(mpcgain mpcdec_static)
Note: See TracChangeset for help on using the changeset viewer.