Changeset 1383

Show
Ignore:
Timestamp:
06/18/08 06:07:57 (2 months ago)
Author:
rexbron
Message:
  • Added soname versioning to openpluginlib and python extention as well as openimagelib.
  • FindGLEW.cmake now uses path_suffixes to find glew headers.
  • Link openpluginlib's python extention (They were not linked before hand).
    • Still need to figure out a solution to non-portable .so problem...
      This could break OL on non-linux platforms...
Location:
trunk
Files:
5 modified

Legend:

Unmodified
Added
Removed

  • trunk

    • Property bzr:revision-id:v3-trunk0

      •  

        old new  
        551377 andrew@aehunter.net-20080616122853-cwqokea7hkf82eo1 
        661378 andrew@aehunter.net-20080616222400-9q0vwtkk6091txce 
         71380 andrew@aehunter.net-20080618110315-ngg1d48fy0h3b6bs 
    • Property bzr:file-ids

      •  

        old new  
        1 FindOpenEXR.cmake       findopenexr.cmake-20080616221215-17ge0xzpvuxlhnjz-1 
        2 src/openimagelib/plugins/jpg/CMakeLists.txt     cmakelists.txt-20080616215536-2e4278apyb0elsd6-1 
    • Property bzr:ancestry:v3-trunk0

      •  

        old new  
        55andrew@aehunter.net-20080616122604-vyn3c4elr33ehlai 
        66andrew@aehunter.net-20080616222235-pb4vb2oeu6cj88m4 
         7andrew@aehunter.net-20080618110236-pfuxsos8x3wd285v 
    • Property bzr:revision-info

      •  

        old new  
        1 timestamp: 2008-06-16 23:24:00.365999937 +0100 
         1timestamp: 2008-06-18 12:03:15.190000057 +0100 
        22committer: Andrew Hunter <andrew@aehunter.net> 
        33properties:  

  • trunk/FindGLEW.cmake

    r1376 r1383  
    2727                 PATHS c:/glew/lib ${COMPILER_PATH}/PlatformSDK/Lib ) 
    2828else( WIN32 ) 
    29    FIND_PATH( GLEW_INCLUDE_DIR GL/glew.h GL/wglew.h gl/glew.h gl/wglew.h 
    30               PATHS /usr/local/include /usr/include ) 
     29   FIND_PATH( GLEW_INCLUDE_DIR glew.h wglew.h 
     30              PATHS /usr/local/include /usr/include 
     31              PATH_SUFFIXES gl/ GL/ ) 
    3132   SET( GLEW_NAMES glew GLEW ) 
    3233   FIND_LIBRARY( GLEW_LIBRARY 

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

    r1376 r1383  
    4848link_directories( ${OpenLibraries_BINARY_DIR}/src/openpluginlib/pl ) 
    4949target_link_libraries( ${NAME} "openpluginlib_pl${LIBRARY_IDENTIFIER}" ) 
     50set_target_properties( ${NAME} PROPERTIES VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH} SOVERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH} ) 

  • trunk/src/openimagelib/plugins/jpg/CMakeLists.txt

    r1381 r1383  
    1010    ADD_LIBRARY ( ${NAME} SHARED ${SOURCES} ) 
    1111    INCLUDE_DIRECTORIES ( ${JPEG_INCLUDE_DIR} ) 
    12     LINK_DIRECTORIES ( ${JPEG_LIBRAIES} ) 
     12    LINK_DIRECTORIES ( ${JPEG_LIBRAIES} ${OpenLibraries_BINARY_DIR}/src/openpluginlib/pl ${OpenLibraries_BINARY_DIR}/src/openimagelib/il/) 
     13    TARGET_LINK_LIBRARIES ( ${NAME} ${JPEG_LIBRAIES} "openpluginlib_pl${LIBRARY_IDENTIFIER}" "openimagelib_il${LIBRARY_IDENTIFIER}" ) 
    1314    INSTALL ( FILES jpg_plugins.opl DESTINATION "lib/${PACKAGE}/openimagelib/plugins/" ) 
    14     INCLUDE ( TARGETS ${NAME} DESTINATION "lib/${PACKAGE}/openimagelib/plugins" ) 
     15    INSTALL( TARGETS ${NAME} DESTINATION "lib/${PACKAGE}/openimagelib/plugins" ) 
    1516ELSE ( JPEG_FOUND ) 
    16     MESSAGE ( "libJPEG not found, skipping jpg plugin." 
     17    MESSAGE ( "libJPEG not found, skipping jpg plugin." ) 
    1718ENDIF ( JPEG_FOUND ) 

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

    r1380 r1383  
    2626MESSAGE ( "Found Python: ${PYTHON_INCLUDE_PATH} ${PYTHON_LIBRARIES} " ) 
    2727INCLUDE_DIRECTORIES ( ${PYTHON_INCLUDE_PATH} ) 
    28 TARGET_LINK_LIBRARIES ( ${NAME} ${PYTHON_LIBRARIES} ) 
     28TARGET_LINK_LIBRARIES ( ${NAME} ${PYTHON_LIBRARIES}  
     29                                ${Boost_LIBRARY_DIRS}/libboost_filesystem.so  
     30                                ${Boost_LIBRARY_DIRS}/libboost_python.so  
     31                                ${Boost_LIBRARY_DIRS}/libboost_regex.so  
     32                                ${Boost_LIBRARY_DIRS}/libboost_thread.so  
     33                                ${XML2_LIBRARIES} 
     34                                ${OpenLibraries_BINARY_DIR}/src/openpluginlib/pl/libopenpluginlib_pl.so ) 
     35 
     36IF ( GLEW_FOUND ) 
     37    TARGET_LINK_LIBRARIES ( ${NAME} ${GLEW_LIBRARY} ) 
     38ENDIF ( GLEW_FOUND ) 
     39 
     40SET_TARGET_PROPERTIES ( ${NAME} PROPERTIES VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH} SOVERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH} ) 
    2941 
    3042INSTALL ( TARGETS ${NAME} LIBRARY DESTINATION "lib/${PACKAGE}/openpluginlib/py/" )