Changeset 1389 for trunk

Show
Ignore:
Timestamp:
06/19/08 07:27:04 (5 months ago)
Author:
rexbron
Message:

Link oml and opl python extentions in a cross-platform friendly way.

Location:
trunk
Files:
3 modified

Legend:

Unmodified
Added
Removed

  • trunk

    • Property bzr:revision-id:v3-trunk0

      •  

        old new  
        10101383 andrew@aehunter.net-20080618200623-29djr6bh81pmu2mu 
        11111384 andrew@aehunter.net-20080618201105-neebgl19i1lbskta 
         121386 andrew@aehunter.net-20080619122646-zgt191pytyx46daj 
    • Property bzr:file-ids

      •  

        old new  
        1 src/openmedialib/plugins/ofx/CMakeLists.txt     cmakelists.txt-20080618195718-n53mf989huhz0bvq-1 
    • Property bzr:ancestry:v3-trunk0

      •  

        old new  
        1010andrew@aehunter.net-20080618190025-f4tqmfnhagk3glij 
        1111andrew@aehunter.net-20080618195823-74quloizraz2fwj2 
         12andrew@aehunter.net-20080619122406-jnh8jzrryfz26k5d 
    • Property bzr:revision-info

      •  

        old new  
        1 timestamp: 2008-06-18 21:11:05.530999899 +0100 
         1timestamp: 2008-06-19 13:26:46.507999897 +0100 
        22committer: Andrew Hunter <andrew@aehunter.net> 
        33properties:  

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

    r1380 r1389  
    1515 
    1616MESSAGE ( "Found Python: ${PYTHON_INCLUDE_PATH} ${PYTHON_LIBRARIES} " ) 
    17 INCLUDE_DIRECTORIES ( ${PYTHON_INCLUDE_PATH} ) 
    18 TARGET_LINK_LIBRARIES ( ${NAME} ${PYTHON_LIBRARIES} ) 
     17INCLUDE_DIRECTORIES ( ${PYTHON_INCLUDE_PATH} ${Boost_INCLUDE_DIR} ) 
     18LINK_DIRECTORIES ( ${OpenLibraries_BINARY_DIR}/src/openimagelib/il/ ) 
     19TARGET_LINK_LIBRARIES ( ${NAME} ${PYTHON_LIBRARIES} 
     20                                ${Boost_PYTHON_LIBRARY} 
     21                                "openimagelib_il${LIBRARY_IDENTIFIER}" ) 
    1922 
    2023INSTALL ( TARGETS ${NAME} LIBRARY DESTINATION "lib/${PACKAGE}/openimagelib/py/" ) 

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

    r1384 r1389  
    2626MESSAGE ( "Found Python: ${PYTHON_INCLUDE_PATH} ${PYTHON_LIBRARIES} " ) 
    2727INCLUDE_DIRECTORIES ( ${PYTHON_INCLUDE_PATH} ) 
     28LINK_DIRECTORIES ( ${OpenLibraries_BINARY_DIR}/src/openpluginlib/pl ) 
    2829TARGET_LINK_LIBRARIES ( ${NAME} ${PYTHON_LIBRARIES}  
    2930                                ${Boost_LIBRARIES} 
    3031                                ${XML2_LIBRARIES} 
    31                                 ${OpenLibraries_BINARY_DIR}/src/openpluginlib/pl/libopenpluginlib_pl.so ) 
     32                                "openpluginlib_pl${LIBRARY_IDENTIFIER}" ) 
    3233 
    3334IF ( GLEW_FOUND )