Changeset 1385

Show
Ignore:
Timestamp:
06/18/08 15:03:16 (5 months ago)
Author:
rexbron
Message:

Link avformat_plugin and oml python extention correctly.

Location:
trunk
Files:
3 modified

Legend:

Unmodified
Added
Removed

  • trunk

    • Property bzr:revision-id:v3-trunk0

      •  

        old new  
        771380 andrew@aehunter.net-20080618110315-ngg1d48fy0h3b6bs 
        881381 andrew@aehunter.net-20080618114001-2574od4etx4v8p9h 
         91382 andrew@aehunter.net-20080618200208-ysmuaq2p7bfh7km4 
    • Property bzr:ancestry:v3-trunk0

      •  

        old new  
        77andrew@aehunter.net-20080618110236-pfuxsos8x3wd285v 
        88andrew@aehunter.net-20080618113925-cjg8er4jn4tmc0dm 
         9andrew@aehunter.net-20080618182841-z2to60sr79wfdq9o 
    • Property bzr:revision-info

      •  

        old new  
        1 timestamp: 2008-06-18 12:40:01.454999924 +0100 
         1timestamp: 2008-06-18 21:02:08.308000088 +0100 
        22committer: Andrew Hunter <andrew@aehunter.net> 
        33properties:  

  • trunk/src/openmedialib/plugins/avformat/CMakeLists.txt

    r1376 r1385  
    2424         LIBRARY DESTINATION "lib/${PACKAGE}/openmedialib/plugins" ) 
    2525 
    26 find_package( FFMPEG ) 
     26find_package( FFMPEG REQUIRED ) 
    2727if( FFMPEG_FOUND ) 
    2828   message( "found FFMPEG: ${FFMPEG_INCLUDE_DIR} ${FFMPEG_LIBRARY_DIR}" ) 
    … …  
    4040                  ${OpenLibraries_BINARY_DIR}/src/openimagelib/il  
    4141                  ${openmedialib_ml_BINARY_DIR} ) 
    42 target_link_libraries( ${NAME} "openpluginlib_pl${LIBRARY_IDENTIFIER}" ) 
    43 target_link_libraries( ${NAME} "openimagelib_il${LIBRARY_IDENTIFIER}" ) 
    44 target_link_libraries( ${NAME} "openmedialib_ml${LIBRARY_IDENTIFIER}" ) 
     42target_link_libraries( ${NAME} "openpluginlib_pl${LIBRARY_IDENTIFIER}"  
     43                               "openimagelib_il${LIBRARY_IDENTIFIER}"  
     44                               "openmedialib_ml${LIBRARY_IDENTIFIER}" 
     45                               ${Boost_FILESYSTEM_LIBRARY} ) 

  • trunk/src/openmedialib/py/CMakeLists.txt

    r1380 r1385  
    1616MESSAGE ( "Found Python: ${PYTHON_INCLUDE_PATH} ${PYTHON_LIBRARIES} " ) 
    1717INCLUDE_DIRECTORIES ( ${PYTHON_INCLUDE_PATH} ) 
    18 TARGET_LINK_LIBRARIES ( ${NAME} ${PYTHON_LIBRARIES} ) 
     18link_directories( ${OpenLibraries_BINARY_DIR}/src/openpluginlib/pl  
     19                  ${openmedialib_ml_BINARY_DIR} ) 
     20TARGET_LINK_LIBRARIES ( ${NAME} ${PYTHON_LIBRARIES} 
     21                                ${Boost_PYTHON_LIBRARY} 
     22                                "openpluginlib_pl${LIBRARY_IDENTIFIER}" 
     23                                "openmedialib_ml${LIBRARY_IDENTFIER}" )  
     24 
     25SET_TARGET_PROPERTIES ( ${NAME} PROPERTIES VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH} SOVERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH} ) 
    1926 
    2027INSTALL ( TARGETS ${NAME} LIBRARY DESTINATION "lib/${PACKAGE}/openmedialib/py/" )