Changeset 1376
- Timestamp:
- 06/14/08 08:03:18 (3 months ago)
- Location:
- trunk
- Files:
-
- 1 added
- 15 modified
-
. (modified) (4 props)
-
.bzrignore (added)
-
CMakeLists.txt (modified) (1 diff)
-
FindFFMPEG.cmake (modified) (1 diff)
-
FindGLEW.cmake (modified) (1 diff)
-
src/openassetlib/al/CMakeLists.txt (modified) (1 diff)
-
src/openimagelib/il/CMakeLists.txt (modified) (1 diff)
-
src/openmedialib/ml/CMakeLists.txt (modified) (1 diff)
-
src/openmedialib/plugins/avformat/CMakeLists.txt (modified) (1 diff)
-
src/openmedialib/plugins/gensys/CMakeLists.txt (modified) (1 diff)
-
src/openmedialib/plugins/glew/CMakeLists.txt (modified) (2 diffs)
-
src/openmedialib/plugins/oil/CMakeLists.txt (modified) (1 diff)
-
src/openmedialib/plugins/openal/CMakeLists.txt (modified) (1 diff)
-
src/openmedialib/plugins/sdl/CMakeLists.txt (modified) (1 diff)
-
src/openobjectlib/sg/CMakeLists.txt (modified) (1 diff)
-
src/openpluginlib/pl/CMakeLists.txt (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk
-
Property
bzr:revision-id:v3-trunk0 set
to
1373 andrew@aehunter.net-20080614130206-thshu8ln95djpgng
-
Property
bzr:file-ids set
to
.bzrignore bzrignore-20080613161045-2n6yxm79gaz9g3on-1
-
Property
bzr:ancestry:v3-trunk0 set
to
andrew@aehunter.net-20080613162705-8emncakb7nkknsbj
-
Property
bzr:revision-info set
to
timestamp: 2008-06-14 14:02:06.701999903 +0100
committer: Andrew Hunter <andrew@aehunter.net>
properties:
branch-nick: trunk
-
Property
bzr:revision-id:v3-trunk0 set
to
-
trunk/CMakeLists.txt
r1373 r1376 80 80 endif( WIN32 ) 81 81 82 IF ( UNIX ) 83 IF ( NOT APPLE ) 84 SET( CMAKE_SKIP_RPATH TRUE ) 85 ENDIF ( NOT APPLE ) 86 ENDIF ( UNIX ) 87 82 88 add_subdirectory( src ) -
trunk/FindFFMPEG.cmake
r1369 r1376 16 16 PATHS $ENV{FFMPEGDIR}/lib ) 17 17 else( WIN32 ) 18 SET( FFMPEG_LIBRARIES avformat.* avcodec.* avutil.* avdevice.* swscale.* ) 19 FIND_PATH( FFMPEG_INCLUDE_DIR ${FFMPEG_HEADERS} 20 PATHS /usr/local/include/ffmpeg /usr/include/ffmpeg ) 21 FIND_PATH( FFMPEG_LIBRARY_DIR ${FFMPEG_LIBRARIES} 22 PATHS /usr/lib /usr/local/lib ) 18 #SET( FFMPEG_LIBRARIES avformat.* avcodec.* avutil.* avdevice.* swscale.* ) 19 #FIND_PATH( FFMPEG_INCLUDE_DIR ${FFMPEG_HEADERS} 20 # PATHS /usr/local/include/ffmpeg /usr/include/ffmpeg ) 21 #FIND_PATH( FFMPEG_LIBRARY_DIR ${FFMPEG_LIBRARIES} 22 # PATHS /usr/lib /usr/local/lib ) 23 #FindAvformat 24 FIND_PATH( AVFORMAT_INCLUDE_DIR avformat.h 25 PATHS /usr/include/ 26 /usr/include/libavformat/ 27 /usr/include/ffmpeg/ 28 /usr/include/ffmpeg/libavformat/ ) 29 30 FIND_LIBRARY( AVFORMAT_LIBRARY avformat 31 PATHS /usr/lib/ 32 /usr/lib/ffmpeg/ ) 33 #FindAvcodec 34 FIND_PATH( AVCODEC_INCLUDE_DIR avcodec.h 35 PATHS /usr/include/ 36 /usr/include/libavcodec/ 37 /usr/include/ffmpeg/ 38 /usr/include/ffmpeg/libavcodec/ ) 39 40 FIND_LIBRARY( AVCODEC_LIBRARY avcodec 41 PATHS /usr/lib/ 42 /usr/lib/ffmpeg/ ) 43 #FindAvutil 44 FIND_PATH( AVUTIL_INCLUDE_DIR avutil.h 45 PATHS /usr/include/ 46 /usr/include/libavutil/ 47 /usr/include/ffmpeg/ 48 /usr/include/ffmpeg/libavutil/ ) 49 50 FIND_LIBRARY( AVUTIL_LIBRARY avutil 51 PATHS /usr/lib/ 52 /usr/lib/ffmpeg/ ) 53 54 #FindAvdevice 55 FIND_PATH( AVDEVICE_INCLUDE_DIR avdevice.h 56 PATHS /usr/include/ 57 /usr/include/libavdevice/ 58 /usr/include/ffmpeg/ 59 /usr/include/ffmpeg/libavdevice/ ) 60 61 FIND_LIBRARY( AVDEVICE_LIBRARY avdevice 62 PATHS /usr/lib/ 63 /usr/lib/ffmpeg/ ) 64 #FindSwscale 65 FIND_PATH( SWSCALE_INCLUDE_DIR swscale.h 66 PATHS /usr/include/ 67 /usr/include/libswscale/ 68 /usr/include/ffmpeg/ 69 /usr/include/ffmpeg/libswscale/ ) 70 71 FIND_LIBRARY( SWSCALE_LIBRARY swscale 72 PATHS /usr/lib/ 73 /usr/lib/ffmpeg/ ) 74 23 75 endif( WIN32 ) 24 76 25 IF (FFMPEG_INCLUDE_DIR AND FFMPEG_LIBRARY_DIR) 26 SET(FFMPEG_FOUND TRUE) 27 FOREACH( l ${FFMPEG_LIBRARIES} ) 28 SET( TMP ${TMP} ${FFMPEG_LIBRARY_DIR}/${l} ) 29 ENDFOREACH( l ) 30 SET( FFMPEG_LIBRARIES ${TMP} ) 31 ELSE (FFMPEG_INCLUDE_DIR AND FFMPEG_LIBRARY_DIR) 32 SET( FFMPEG_FOUND FALSE ) 33 SET( FFMPEG_LIBRARY_DIR ) 34 ENDIF (FFMPEG_INCLUDE_DIR AND FFMPEG_LIBRARY_DIR) 77 SET( FFMPEG_FOUND FALSE ) 78 79 IF ( AVFORMAT_INCLUDE_DIR AND AVFORMAT_LIBRARY ) 80 SET ( AVFORMAT_FOUND TRUE ) 81 ENDIF ( AVFORMAT_INCLUDE_DIR AND AVFORMAT_LIBRARY ) 82 83 IF ( AVCODEC_INCLUDE_DIR AND AVCODEC_LIBRARY ) 84 SET ( AVCODEC_FOUND TRUE) 85 ENDIF ( AVCODEC_INCLUDE_DIR AND AVCODEC_LIBRARY ) 86 87 IF ( AVUTIL_INCLUDE_DIR AND AVUTIL_LIBRARY ) 88 SET ( AVUTIL_FOUND TRUE ) 89 ENDIF ( AVUTIL_INCLUDE_DIR AND AVUTIL_LIBRARY ) 90 91 IF ( AVDEVICE_INCLUDE_DIR AND AVDEVICE_LIBRARY ) 92 SET ( AVDEVICE_FOUND TRUE ) 93 ENDIF ( AVDEVICE_INCLUDE_DIR AND AVDEVICE_LIBRARY ) 94 95 IF ( SWSCALE_INCLUDE_DIR AND SWSCALE_LIBRARY ) 96 SET ( SWSCALE_FOUND TRUE ) 97 ENDIF ( SWSCALE_INCLUDE_DIR AND SWSCALE_LIBRARY ) 98 99 100 IF ( WIN32 ) 101 IF (FFMPEG_INCLUDE_DIR AND FFMPEG_LIBRARY_DIR) 102 SET(FFMPEG_FOUND TRUE) 103 FOREACH( l ${FFMPEG_LIBRARIES} ) 104 SET( TMP ${TMP} ${FFMPEG_LIBRARY_DIR}/${l} ) 105 ENDFOREACH( l ) 106 SET( FFMPEG_LIBRARIES ${TMP} ) 107 ELSE (FFMPEG_INCLUDE_DIR AND FFMPEG_LIBRARY_DIR) 108 SET( FFMPEG_FOUND FALSE ) 109 SET( FFMPEG_LIBRARY_DIR ) 110 ENDIF (FFMPEG_INCLUDE_DIR AND FFMPEG_LIBRARY_DIR) 111 ELSE ( WIN32 ) 112 113 IF ( AVFORMAT_INCLUDE_DIR OR AVCODEC_INCLUDE_DIR OR AVUTIL_INCLUDE_DIR OR AVDEVICE_FOUND OR SWSCALE_FOUND ) 114 115 SET ( FFMPEG_FOUND TRUE ) 116 117 SET ( FFMPEG_INCLUDE_DIR 118 ${AVFORMAT_INCLUDE_DIR} 119 ${AVCODEC_INCLUDE_DIR} 120 ${AVUTIL_INCLUDE_DIR} 121 ${AVDEVICE_INCLUDE_DIR} 122 ${SWSCALE_INCLUDE_DIR} ) 123 124 SET ( FFMPEG_LIBRARIES 125 ${AVFORMAT_LIBRARY} 126 ${AVCODEC_LIBRARY} 127 ${AVUTIL_LIBRARY} 128 ${AVDEVICE_LIBRARY} 129 ${SWSCALE_LIBRARY} ) 130 131 ENDIF ( AVFORMAT_INCLUDE_DIR OR AVCODEC_INCLUDE_DIR OR AVUTIL_INCLUDE_DIR OR AVDEVICE_FOUND OR SWSCALE_FOUND ) 132 133 ENDIF ( WIN32 ) 35 134 36 135 MARK_AS_ADVANCED( -
trunk/FindGLEW.cmake
r1366 r1376 27 27 PATHS c:/glew/lib ${COMPILER_PATH}/PlatformSDK/Lib ) 28 28 else( WIN32 ) 29 FIND_PATH( GLEW_INCLUDE_DIR gl/glew.h gl/wglew.h29 FIND_PATH( GLEW_INCLUDE_DIR GL/glew.h GL/wglew.h gl/glew.h gl/wglew.h 30 30 PATHS /usr/local/include /usr/include ) 31 SET( GLEW_NAMES glew )31 SET( GLEW_NAMES glew GLEW ) 32 32 FIND_LIBRARY( GLEW_LIBRARY 33 33 NAMES ${GLEW_NAMES} -
trunk/src/openassetlib/al/CMakeLists.txt
r1367 r1376 40 40 install( TARGETS ${NAME} 41 41 RUNTIME DESTINATION "lib/${PACKAGE}/openassetlib/lib" 42 ARCHIVE DESTINATION "lib/${PACKAGE}/openassetlib/lib" ) 42 ARCHIVE DESTINATION "lib/${PACKAGE}/openassetlib/lib" 43 LIBRARY DESTINATION "lib/${PACKAGE}/openassetlib/lib" ) 43 44 44 45 # required links -
trunk/src/openimagelib/il/CMakeLists.txt
r1367 r1376 42 42 install( TARGETS ${NAME} 43 43 RUNTIME DESTINATION "lib/${PACKAGE}/openimagelib/lib" 44 ARCHIVE DESTINATION "lib/${PACKAGE}/openimagelib/lib" ) 44 ARCHIVE DESTINATION "lib/${PACKAGE}/openimagelib/lib" 45 LIBRARY DESTINATION "lib/${PACKAGE}/openimagelib/lib" ) 45 46 46 47 # required links -
trunk/src/openmedialib/ml/CMakeLists.txt
r1367 r1376 41 41 install( TARGETS ${NAME} 42 42 RUNTIME DESTINATION "lib/${PACKAGE}/openmedialib/lib" 43 ARCHIVE DESTINATION "lib/${PACKAGE}/openmedialib/lib" ) 43 ARCHIVE DESTINATION "lib/${PACKAGE}/openmedialib/lib" 44 LIBRARY DESTINATION "lib/${PACKAGE}/openmedialib/lib" ) 44 45 45 46 # required links -
trunk/src/openmedialib/plugins/avformat/CMakeLists.txt
r1369 r1376 20 20 21 21 add_library( ${NAME} SHARED ${SOURCES} ) 22 install( TARGETS ${NAME} RUNTIME DESTINATION "lib/${PACKAGE}/openmedialib/plugins" ) 22 install( TARGETS ${NAME} 23 RUNTIME DESTINATION "lib/${PACKAGE}/openmedialib/plugins" 24 LIBRARY DESTINATION "lib/${PACKAGE}/openmedialib/plugins" ) 23 25 24 26 find_package( FFMPEG ) -
trunk/src/openmedialib/plugins/gensys/CMakeLists.txt
r1367 r1376 20 20 21 21 add_library( ${NAME} SHARED ${SOURCES} ) 22 install( TARGETS ${NAME} RUNTIME DESTINATION "lib/${PACKAGE}/openmedialib/plugins" ) 22 install( TARGETS ${NAME} 23 RUNTIME DESTINATION "lib/${PACKAGE}/openmedialib/plugins" 24 LIBRARY DESTINATION "lib/${PACKAGE}/openmedialib/plugins" ) 23 25 24 26 # required links -
trunk/src/openmedialib/plugins/glew/CMakeLists.txt
r1367 r1376 11 11 endif( WIN32 ) 12 12 13 IF( UNIX ) 14 IF( APPLE ) 15 #Does OS X need a HAVE_GL_GLUT_H definition? 16 ELSE( APPLE ) 17 ADD_DEFINITIONS( -DHAVE_GL_GLUT_H ) 18 ENDIF( APPLE ) 19 ENDIF( UNIX ) 20 13 21 set( SOURCES 14 22 glew_plugin.cpp ) … … 20 28 21 29 add_library( ${NAME} SHARED ${SOURCES} ) 22 install( TARGETS ${NAME} RUNTIME DESTINATION "lib/${PACKAGE}/openmedialib/plugins" ) 30 install( TARGETS ${NAME} 31 RUNTIME DESTINATION "lib/${PACKAGE}/openmedialib/plugins" 32 LIBRARY DESTINATION "lib/${PACKAGE}/openmedialib/plugins" ) 23 33 24 34 if( WIN32 ) -
trunk/src/openmedialib/plugins/oil/CMakeLists.txt
r1367 r1376 20 20 21 21 add_library( ${NAME} SHARED ${SOURCES} ) 22 install( TARGETS ${NAME} RUNTIME DESTINATION "lib/${PACKAGE}/openmedialib/plugins" ) 22 install( TARGETS ${NAME} 23 RUNTIME DESTINATION "lib/${PACKAGE}/openmedialib/plugins" 24 LIBRARY DESTINATION "lib/${PACKAGE}/openmedialib/plugins" ) 23 25 24 26 # required links -
trunk/src/openmedialib/plugins/openal/CMakeLists.txt
r1373 r1376 20 20 21 21 add_library( ${NAME} SHARED ${SOURCES} ) 22 install( TARGETS ${NAME} RUNTIME DESTINATION "lib/${PACKAGE}/openmedialib/plugins" ) 22 install( TARGETS ${NAME} 23 RUNTIME DESTINATION "lib/${PACKAGE}/openmedialib/plugins" 24 LIBRARY DESTINATION "lib/${PACKAGE}/openmedialib/plugins" ) 23 25 24 26 # OpenAL -
trunk/src/openmedialib/plugins/sdl/CMakeLists.txt
r1367 r1376 20 20 21 21 add_library( ${NAME} SHARED ${SOURCES} ) 22 install( TARGETS ${NAME} RUNTIME DESTINATION "lib/${PACKAGE}/openmedialib/plugins" ) 22 install( TARGETS ${NAME} 23 RUNTIME DESTINATION "lib/${PACKAGE}/openmedialib/plugins" 24 LIBRARY DESTINATION "lib/${PACKAGE}/openmedialib/plugins" ) 23 25 24 26 # SDL -
trunk/src/openobjectlib/sg/CMakeLists.txt
r1367 r1376 67 67 install( TARGETS ${NAME} 68 68 RUNTIME DESTINATION "lib/${PACKAGE}/openobjectlib/lib" 69 ARCHIVE DESTINATION "lib/${PACKAGE}/openobjectlib/lib" ) 69 ARCHIVE DESTINATION "lib/${PACKAGE}/openobjectlib/lib" 70 LIBRARY DESTINATION "lib/${PACKAGE}/openobjectlib/lib" ) 70 71 71 72 # required links -
trunk/src/openpluginlib/pl/CMakeLists.txt
r1367 r1376 116 116 install( TARGETS ${NAME} 117 117 RUNTIME DESTINATION "lib/${PACKAGE}/openpluginlib/lib" 118 ARCHIVE DESTINATION "lib/${PACKAGE}/openpluginlib/lib" ) 118 ARCHIVE DESTINATION "lib/${PACKAGE}/openpluginlib/lib" 119 LIBRARY DESTINATION "lib/${PACKAGE}/openpluginlib/lib" ) 119 120 120 121 if( GLEW_FOUND )
