Changeset 1366

Show
Ignore:
Timestamp:
03/18/08 13:52:01 (8 months ago)
Author:
timdewhirst
Message:

openlibraries
- more on cmake

Location:
trunk
Files:
9 added
6 modified

Legend:

Unmodified
Added
Removed

  • trunk/CMakeLists.txt

    r1365 r1366  
    5151   message( "found GLEW: ${GLEW_INCLUDE_DIR}" ) 
    5252   include_directories( ${GLEW_INCLUDE_DIR} ) 
    53    link_directories( ${GLEW_LIBRARIES} ) 
     53   link_directories( ${GLEW_LIBRARY_DIR} ) 
    5454 
    55    add_definitions( -DHAVE_GL_GLEW_H ) 
    5655   set ( SHARE_PATH ${CMAKE_INSTALL_PREFIX}/share/${PACKAGE} ) 
    5756   add_definitions( -DOPENOBJECTLIB_SHADERS="\\\"${SHARE_PATH}/shaders\\\"" ) 

  • trunk/FindGLEW.cmake

    r1365 r1366  
    44#  GLEW_FOUND        - system has GLEW 
    55#  GLEW_INCLUDE_DIR  - the GLEW include directory 
    6 #  GLEW_LIBRARIES    - Link these to use GLEW 
     6#  GLEW_LIBRARY_DIR  - where the libraries are 
     7#  GLEW_LIBRARY      - Link these to use GLEW 
    78#    
    89 
    … …  
    3435endif( WIN32 ) 
    3536 
     37GET_FILENAME_COMPONENT( GLEW_LIBRARY_DIR ${GLEW_LIBRARY} PATH ) 
     38 
    3639IF (GLEW_INCLUDE_DIR AND GLEW_LIBRARY) 
    3740   SET(GLEW_FOUND TRUE) 
    38     SET( GLEW_LIBRARIES ${GLEW_LIBRARY} ) 
     41    SET( GLEW_LIBRARY_DIR ${GLEW_LIBRARY} ) 
    3942ELSE (GLEW_INCLUDE_DIR AND GLEW_LIBRARY) 
    40    SET(GLEW_FOUND FALSE) 
    41    SET( GLEW_LIBRARIES ) 
     43   SET( GLEW_FOUND FALSE ) 
     44   SET( GLEW_LIBRARY_DIR ) 
    4245ENDIF (GLEW_INCLUDE_DIR AND GLEW_LIBRARY) 
    4346 

  • trunk/src/openimagelib/il/config.hpp

    r1347 r1366  
    5151#endif 
    5252 
    53 // library search record (auto link). 
    54 #if defined( WIN32 ) && !defined( OPENIMAGELIB_BUILD ) 
    55 #       if defined( OPENIMAGELIB_LIBNAME ) && defined( OPENIMAGELIB_TOOLSET ) && defined( OPENIMAGELIB_DEBUG_SUFFIX ) && defined( OPENIMAGELIB_VERSION ) 
    56 #               pragma comment( lib, OPENIMAGELIB_LIBNAME "-" OPENIMAGELIB_TOOLSET "-" OPENIMAGELIB_DEBUG_SUFFIX "-" OPENIMAGELIB_VERSION ".lib" ) 
    57 #       endif 
    58 #endif 
     53// // library search record (auto link). 
     54// #if defined( WIN32 ) && !defined( OPENIMAGELIB_BUILD ) 
     55// #    if defined( OPENIMAGELIB_LIBNAME ) && defined( OPENIMAGELIB_TOOLSET ) && defined( OPENIMAGELIB_DEBUG_SUFFIX ) && defined( OPENIMAGELIB_VERSION ) 
     56// #            pragma comment( lib, OPENIMAGELIB_LIBNAME "-" OPENIMAGELIB_TOOLSET "-" OPENIMAGELIB_DEBUG_SUFFIX "-" OPENIMAGELIB_VERSION ".lib" ) 
     57// #    endif 
     58// #endif 
    5959 
    6060#endif 

  • trunk/src/openmedialib/ml/config.hpp

    r1347 r1366  
    6565#endif 
    6666 
    67 // library search record (auto link). 
    68 #if defined( WIN32 ) && !defined( OPENMEDIALIB_BUILD ) 
    69 #       if defined( OPENMEDIALIB_LIBNAME ) && defined( OPENMEDIALIB_TOOLSET ) && defined( OPENMEDIALIB_DEBUG_SUFFIX ) && defined( OPENMEDIALIB_VERSION ) 
    70 #               pragma comment( lib, OPENMEDIALIB_LIBNAME "-" OPENMEDIALIB_TOOLSET "-" OPENMEDIALIB_DEBUG_SUFFIX "-" OPENMEDIALIB_VERSION ".lib" ) 
    71 #       endif 
    72 #endif 
     67// // library search record (auto link). 
     68// #if defined( WIN32 ) && !defined( OPENMEDIALIB_BUILD ) 
     69// #    if defined( OPENMEDIALIB_LIBNAME ) && defined( OPENMEDIALIB_TOOLSET ) && defined( OPENMEDIALIB_DEBUG_SUFFIX ) && defined( OPENMEDIALIB_VERSION ) 
     70// #            pragma comment( lib, OPENMEDIALIB_LIBNAME "-" OPENMEDIALIB_TOOLSET "-" OPENMEDIALIB_DEBUG_SUFFIX "-" OPENMEDIALIB_VERSION ".lib" ) 
     71// #    endif 
     72// #endif 
    7373 
    7474#endif 

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

    r1365 r1366  
    110110 
    111111add_library( ${NAME} SHARED ${SOURCES} ) 
    112 install( TARGETS ${NAME} LIBRARY DESTINATION "lib/${PACKAGE}/openpluginlib/lib" ) 
     112install( TARGETS ${NAME}  
     113         RUNTIME DESTINATION "lib/${PACKAGE}/openpluginlib/lib" 
     114         ARCHIVE DESTINATION "lib/${PACKAGE}/openpluginlib/lib" ) 
     115 
     116if( GLEW_FOUND ) 
     117    target_link_libraries( ${NAME} ${GLEW_LIBRARY} ) 
     118endif( GLEW_FOUND ) 

  • trunk/src/openpluginlib/pl/config.hpp

    r1364 r1366  
    5151#endif 
    5252 
    53 // library search record (auto link). 
    54 #if defined( WIN32 ) && !defined( OPENPLUGINLIB_BUILD ) 
    55 #       if defined( OPENPLUGINLIB_LIBNAME ) && defined( OPENPLUGINLIB_TOOLSET ) && defined( OPENPLUGINLIB_DEBUG_SUFFIX ) && defined( OPENPLUGINLIB_VERSION ) 
    56 #               pragma comment( lib, OPENPLUGINLIB_LIBNAME "-" OPENPLUGINLIB_TOOLSET "-" OPENPLUGINLIB_DEBUG_SUFFIX "-" OPENPLUGINLIB_VERSION ".lib" ) 
    57 #       endif 
    58 #endif 
     53// // library search record (auto link). 
     54// #if defined( WIN32 ) && !defined( OPENPLUGINLIB_BUILD ) 
     55// #    if defined( OPENPLUGINLIB_LIBNAME ) && defined( OPENPLUGINLIB_TOOLSET ) && defined( OPENPLUGINLIB_DEBUG_SUFFIX ) && defined( OPENPLUGINLIB_VERSION ) 
     56// #            pragma comment( lib, OPENPLUGINLIB_LIBNAME "-" OPENPLUGINLIB_TOOLSET "-" OPENPLUGINLIB_DEBUG_SUFFIX "-" OPENPLUGINLIB_VERSION ".lib" ) 
     57// #    endif 
     58// #endif 
    5959 
    6060#endif