Thread: [Jahshaka-cvs] SF.net SVN: openlibraries: [1368] trunk (Page 2)
Status: Beta
Brought to you by:
jahshaka
From: <tim...@us...> - 2008-03-19 11:17:49
|
Revision: 1368 http://openlibraries.svn.sourceforge.net/openlibraries/?rev=1368&view=rev Author: timdewhirst Date: 2008-03-19 04:17:35 -0700 (Wed, 19 Mar 2008) Log Message: ----------- openlibraries - ffmpeg support - revert disabled Cg support in pl_vc8.vcproj Modified Paths: -------------- trunk/src/openpluginlib/pl/pl_vc8.vcproj Added Paths: ----------- trunk/FindFFMPEG.cmake trunk/src/openmedialib/plugins/avformat/CMakeLists.txt Added: trunk/FindFFMPEG.cmake =================================================================== --- trunk/FindFFMPEG.cmake (rev 0) +++ trunk/FindFFMPEG.cmake 2008-03-19 11:17:35 UTC (rev 1368) @@ -0,0 +1,35 @@ +# - Try to find FFMPEG +# Once done this will define +# +# FFMPEG_FOUND - system has FFMPEG +# FFMPEG_INCLUDE_DIR - the include directory +# FFMPEG_LIBRARIES - Link these to use FFMPEG +# + +SET( FFMPEG_NAMES avformat avcodec avutil avdevice swscale ) +SET( FFMPEG_HEADERS avformat.h avcodec.h avutil.h avdevice.h swscale.h ) +if( WIN32 ) + FIND_PATH( FFMPEG_INCLUDE_DIR ${FFMPEG_HEADERS} + PATHS $ENV{FFMPEGDIR}/include/ffmpeg ) + FIND_LIBRARY( FFMPEG_LIBRARIES + NAMES ${FFMPEG_NAMES} + PATHS $ENV{FFMPEGDIR}/lib ) +else( WIN32 ) + FIND_PATH( FFMPEG_INCLUDE_DIR ${FFMPEG_HEADERS} + PATHS /usr/local/include/ffmpeg /usr/include/ffmpeg ) + FIND_LIBRARY( FFMPEG_LIBRARIES + NAMES ${FFMPEG_NAMES} + PATHS /usr/lib /usr/local/lib ) +endif( WIN32 ) + +IF (FFMPEG_INCLUDE_DIR AND FFMPEG_LIBRARIES) + SET(FFMPEG_FOUND TRUE) +ELSE (FFMPEG_INCLUDE_DIR AND FFMPEG_LIBRARIES) + SET( FFMPEG_FOUND FALSE ) + SET( FFMPEG_LIBRARY_DIR ) +ENDIF (FFMPEG_INCLUDE_DIR AND FFMPEG_LIBRARIES) + +MARK_AS_ADVANCED( + FFMPEG_LIBRARIES + FFMPEG_INCLUDE_DIR +) Added: trunk/src/openmedialib/plugins/avformat/CMakeLists.txt =================================================================== --- trunk/src/openmedialib/plugins/avformat/CMakeLists.txt (rev 0) +++ trunk/src/openmedialib/plugins/avformat/CMakeLists.txt 2008-03-19 11:17:35 UTC (rev 1368) @@ -0,0 +1,37 @@ + +include_directories( ${OpenLibraries_SOURCE_DIR}/src ) +set( NAME openmedialib_avformat ) + +if( WIN32 ) + add_definitions( -DML_PLUGIN_EXPORTS ) + add_definitions( -DOPENIMAGELIB_LIBNAME=\\\"${NAME}\\\" ) + add_definitions( -DOPENIMAGELIB_VERSION=\\\"${VERSION_STRING}\\\" ) + add_definitions( -DOPENIMAGELIB_BUILD ) + set( NAME "${NAME}${LIBRARY_IDENTIFIER}" ) +endif( WIN32 ) + +set( SOURCES + avformat_plugin.cpp ) + +install( + FILES + avformat_plugin.opl + DESTINATION "lib/${PACKAGE}/openmedialib/plugins" ) + +add_library( ${NAME} SHARED ${SOURCES} ) +install( TARGETS ${NAME} RUNTIME DESTINATION "lib/${PACKAGE}/openmedialib/plugins" ) + +find_package( FFMPEG ) +if( FFMPEG_FOUND ) + message( "found FFMPEG: ${FFMPEG_INCLUDE_DIR}" ) + include_directories( ${FFMPEG_INCLUDE_DIR} ) + target_link_libraries( ${NAME} ${FFMPEG_LIBRARIES} ) +endif( FFMPEG_FOUND ) + +# required links +link_directories( ${OpenLibraries_BINARY_DIR}/src/openpluginlib/pl + ${OpenLibraries_BINARY_DIR}/src/openimagelib/il + ${openmedialib_ml_BINARY_DIR} ) +target_link_libraries( ${NAME} "openpluginlib_pl${LIBRARY_IDENTIFIER}" ) +target_link_libraries( ${NAME} "openimagelib_il${LIBRARY_IDENTIFIER}" ) +target_link_libraries( ${NAME} "openmedialib_ml${LIBRARY_IDENTIFIER}" ) Modified: trunk/src/openpluginlib/pl/pl_vc8.vcproj =================================================================== --- trunk/src/openpluginlib/pl/pl_vc8.vcproj 2008-03-19 01:20:36 UTC (rev 1367) +++ trunk/src/openpluginlib/pl/pl_vc8.vcproj 2008-03-19 11:17:35 UTC (rev 1368) @@ -42,7 +42,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34_1";"C:\Program Files\NVIDIA Corporation\Cg\include"" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;OPENPLUGINLIB_EXPORTS;OPENPLUGINLIB_BUILD;HAVE_FLEX_STRING;HAVE_CG_RUNTIME__;HAVE_BOOST_FILESYSTEM;HAVE_FAST_MATH" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;OPENPLUGINLIB_EXPORTS;OPENPLUGINLIB_BUILD;HAVE_FLEX_STRING;HAVE_CG_RUNTIME;HAVE_BOOST_FILESYSTEM;HAVE_FAST_MATH" MinimalRebuild="true" ExceptionHandling="2" BasicRuntimeChecks="3" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tim...@us...> - 2008-03-20 08:38:14
|
Revision: 1369 http://openlibraries.svn.sourceforge.net/openlibraries/?rev=1369&view=rev Author: timdewhirst Date: 2008-03-20 01:37:34 -0700 (Thu, 20 Mar 2008) Log Message: ----------- openlibraries - ensure all ffmpeg libs are linked Modified Paths: -------------- trunk/FindFFMPEG.cmake trunk/src/openmedialib/plugins/avformat/CMakeLists.txt Modified: trunk/FindFFMPEG.cmake =================================================================== --- trunk/FindFFMPEG.cmake 2008-03-19 11:17:35 UTC (rev 1368) +++ trunk/FindFFMPEG.cmake 2008-03-20 08:37:34 UTC (rev 1369) @@ -3,33 +3,37 @@ # # FFMPEG_FOUND - system has FFMPEG # FFMPEG_INCLUDE_DIR - the include directory +# FFMPEG_LIBRARY_DIR - the directory containing the libraries # FFMPEG_LIBRARIES - Link these to use FFMPEG # -SET( FFMPEG_NAMES avformat avcodec avutil avdevice swscale ) SET( FFMPEG_HEADERS avformat.h avcodec.h avutil.h avdevice.h swscale.h ) if( WIN32 ) + SET( FFMPEG_LIBRARIES avformat.lib avcodec.lib avutil.lib avdevice.lib swscale.lib ) FIND_PATH( FFMPEG_INCLUDE_DIR ${FFMPEG_HEADERS} PATHS $ENV{FFMPEGDIR}/include/ffmpeg ) - FIND_LIBRARY( FFMPEG_LIBRARIES - NAMES ${FFMPEG_NAMES} - PATHS $ENV{FFMPEGDIR}/lib ) + FIND_PATH( FFMPEG_LIBRARY_DIR ${FFMPEG_LIBRARIES} + PATHS $ENV{FFMPEGDIR}/lib ) else( WIN32 ) + SET( FFMPEG_LIBRARIES avformat.* avcodec.* avutil.* avdevice.* swscale.* ) FIND_PATH( FFMPEG_INCLUDE_DIR ${FFMPEG_HEADERS} PATHS /usr/local/include/ffmpeg /usr/include/ffmpeg ) - FIND_LIBRARY( FFMPEG_LIBRARIES - NAMES ${FFMPEG_NAMES} - PATHS /usr/lib /usr/local/lib ) + FIND_PATH( FFMPEG_LIBRARY_DIR ${FFMPEG_LIBRARIES} + PATHS /usr/lib /usr/local/lib ) endif( WIN32 ) -IF (FFMPEG_INCLUDE_DIR AND FFMPEG_LIBRARIES) +IF (FFMPEG_INCLUDE_DIR AND FFMPEG_LIBRARY_DIR) SET(FFMPEG_FOUND TRUE) -ELSE (FFMPEG_INCLUDE_DIR AND FFMPEG_LIBRARIES) + FOREACH( l ${FFMPEG_LIBRARIES} ) + SET( TMP ${TMP} ${FFMPEG_LIBRARY_DIR}/${l} ) + ENDFOREACH( l ) + SET( FFMPEG_LIBRARIES ${TMP} ) +ELSE (FFMPEG_INCLUDE_DIR AND FFMPEG_LIBRARY_DIR) SET( FFMPEG_FOUND FALSE ) SET( FFMPEG_LIBRARY_DIR ) -ENDIF (FFMPEG_INCLUDE_DIR AND FFMPEG_LIBRARIES) +ENDIF (FFMPEG_INCLUDE_DIR AND FFMPEG_LIBRARY_DIR) MARK_AS_ADVANCED( - FFMPEG_LIBRARIES + FFMPEG_LIBRARY_DIR FFMPEG_INCLUDE_DIR ) Modified: trunk/src/openmedialib/plugins/avformat/CMakeLists.txt =================================================================== --- trunk/src/openmedialib/plugins/avformat/CMakeLists.txt 2008-03-19 11:17:35 UTC (rev 1368) +++ trunk/src/openmedialib/plugins/avformat/CMakeLists.txt 2008-03-20 08:37:34 UTC (rev 1369) @@ -23,11 +23,16 @@ find_package( FFMPEG ) if( FFMPEG_FOUND ) - message( "found FFMPEG: ${FFMPEG_INCLUDE_DIR}" ) + message( "found FFMPEG: ${FFMPEG_INCLUDE_DIR} ${FFMPEG_LIBRARY_DIR}" ) include_directories( ${FFMPEG_INCLUDE_DIR} ) target_link_libraries( ${NAME} ${FFMPEG_LIBRARIES} ) endif( FFMPEG_FOUND ) +# kill some warnings +if ( WIN32 ) + set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4244" ) +endif( WIN32 ) + # required links link_directories( ${OpenLibraries_BINARY_DIR}/src/openpluginlib/pl ${OpenLibraries_BINARY_DIR}/src/openimagelib/il This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tim...@us...> - 2008-03-25 17:21:29
|
Revision: 1370 http://openlibraries.svn.sourceforge.net/openlibraries/?rev=1370&view=rev Author: timdewhirst Date: 2008-03-25 10:20:32 -0700 (Tue, 25 Mar 2008) Log Message: ----------- olibs - revert patch level to 0 - make errors go to cerr, not wcerr - update missed version in sdl_plugin.opl Modified Paths: -------------- trunk/CMakeLists.txt trunk/src/openmedialib/ml/utilities.cpp trunk/src/openmedialib/plugins/sdl/sdl_plugin.opl Modified: trunk/CMakeLists.txt =================================================================== --- trunk/CMakeLists.txt 2008-03-20 08:37:34 UTC (rev 1369) +++ trunk/CMakeLists.txt 2008-03-25 17:20:32 UTC (rev 1370) @@ -2,7 +2,7 @@ set( VERSION_MAJOR 0 ) set( VERSION_MINOR 5 ) -set( VERSION_PATCH 1 ) +set( VERSION_PATCH 0 ) set( PACKAGE "openlibraries-${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}" ) set( VERSION_STRING "${VERSION_MAJOR}_${VERSION_MINOR}_${VERSION_PATCH}" ) Modified: trunk/src/openmedialib/ml/utilities.cpp =================================================================== --- trunk/src/openmedialib/ml/utilities.cpp 2008-03-20 08:37:34 UTC (rev 1369) +++ trunk/src/openmedialib/ml/utilities.cpp 2008-03-25 17:20:32 UTC (rev 1370) @@ -459,7 +459,7 @@ { openmedialib_plugin_ptr plug = get_plug( resource, L"input" ); if ( plug == 0 ) - std::wcerr << "create_input: failed to find a plugin for: " << resource << "\n"; + std::cerr << "create_input: failed to find a plugin for: " << pl::to_string( resource ) << "\n"; return plug == 0 ? input_type_ptr( ) : plug->input( resource ); } @@ -484,7 +484,7 @@ store_type_ptr result = store_type_ptr( ); openmedialib_plugin_ptr plug = get_plug( resource, L"output" ); if ( plug == 0 ) - std::wcerr << "create_store: failed to find a plugin for: " << resource << "\n"; + std::cerr << "create_store: failed to find a plugin for: " << pl::to_string( resource ) << "\n"; return plug == 0 ? result : plug->store( resource, frame ); } Modified: trunk/src/openmedialib/plugins/sdl/sdl_plugin.opl =================================================================== --- trunk/src/openmedialib/plugins/sdl/sdl_plugin.opl 2008-03-20 08:37:34 UTC (rev 1369) +++ trunk/src/openmedialib/plugins/sdl/sdl_plugin.opl 2008-03-25 17:20:32 UTC (rev 1370) @@ -2,6 +2,6 @@ <openlibraries version="1.0"> <!-- plugins go here --> <openmedialib name="oml" version="0.1.0"> - <plugin name="OpenLibraries sdl plugin" type="output" extension='"sdl:", "sdl_video:", "sdl_audio:"' merit="0" filename='"libopenmedialib_sdl.so", "libopenmedialib_sdl.dylib", "openmedialib_sdl-vc71-d-0_4_1.dll", "openmedialib_sdl-vc71-r-0_4_1.dll", "openmedialib_sdl-vc80-d-0_4_1.dll", "openmedialib_sdl-vc80-r-0_4_1.dll"'/> + <plugin name="OpenLibraries sdl plugin" type="output" extension='"sdl:", "sdl_video:", "sdl_audio:"' merit="0" filename='"libopenmedialib_sdl.so", "libopenmedialib_sdl.dylib", "openmedialib_sdl-vc71-d-0_5_0.dll", "openmedialib_sdl-vc71-r-0_5_0.dll", "openmedialib_sdl-vc80-d-0_5_0.dll", "openmedialib_sdl-vc80-r-0_5_0.dll"'/> </openmedialib> </openlibraries> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tim...@us...> - 2008-04-26 00:14:25
|
Revision: 1373 http://openlibraries.svn.sourceforge.net/openlibraries/?rev=1373&view=rev Author: timdewhirst Date: 2008-04-25 17:14:19 -0700 (Fri, 25 Apr 2008) Log Message: ----------- openmedialib - enable openal plugin build Modified Paths: -------------- trunk/CMakeLists.txt trunk/src/openmedialib/plugins/CMakeLists.txt Added Paths: ----------- trunk/src/openmedialib/plugins/openal/CMakeLists.txt Modified: trunk/CMakeLists.txt =================================================================== --- trunk/CMakeLists.txt 2008-04-23 22:46:08 UTC (rev 1372) +++ trunk/CMakeLists.txt 2008-04-26 00:14:19 UTC (rev 1373) @@ -72,11 +72,11 @@ if( MSVC71 ) set( COMPILER "vc71" ) endif( MSVC71 ) - if ( CMAKE_BUILD_TYPE STREQUAL "Release" ) + if ( CMAKE_BUILD_TYPE STREQUAL "Debug" ) + set( LIBRARY_IDENTIFIER "-${COMPILER}-d-${VERSION_STRING}" ) + else( CMAKE_BUILD_TYPE STREQUAL "Debug" ) set( LIBRARY_IDENTIFIER "-${COMPILER}-r-${VERSION_STRING}" ) - else( CMAKE_BUILD_TYPE STREQUAL "Release" ) - set( LIBRARY_IDENTIFIER "-${COMPILER}-d-${VERSION_STRING}" ) - endif( CMAKE_BUILD_TYPE STREQUAL "Release" ) + endif( CMAKE_BUILD_TYPE STREQUAL "Debug" ) endif( WIN32 ) add_subdirectory( src ) Modified: trunk/src/openmedialib/plugins/CMakeLists.txt =================================================================== --- trunk/src/openmedialib/plugins/CMakeLists.txt 2008-04-23 22:46:08 UTC (rev 1372) +++ trunk/src/openmedialib/plugins/CMakeLists.txt 2008-04-26 00:14:19 UTC (rev 1373) @@ -3,7 +3,7 @@ add_subdirectory( avformat ) add_subdirectory( gensys ) #add_subdirectory( ofx ) -#add_subdirectory( openal ) +add_subdirectory( openal ) add_subdirectory( sdl ) if( WIN32 ) Added: trunk/src/openmedialib/plugins/openal/CMakeLists.txt =================================================================== --- trunk/src/openmedialib/plugins/openal/CMakeLists.txt (rev 0) +++ trunk/src/openmedialib/plugins/openal/CMakeLists.txt 2008-04-26 00:14:19 UTC (rev 1373) @@ -0,0 +1,38 @@ + +include_directories( ${OpenLibraries_SOURCE_DIR}/src ) +set( NAME openmedialib_openal ) + +if( WIN32 ) + add_definitions( -DML_PLUGIN_EXPORTS ) + add_definitions( -DOPENIMAGELIB_LIBNAME=\\\"${NAME}\\\" ) + add_definitions( -DOPENIMAGELIB_VERSION=\\\"${VERSION_STRING}\\\" ) + add_definitions( -DOPENIMAGELIB_BUILD ) + set( NAME "${NAME}${LIBRARY_IDENTIFIER}" ) +endif( WIN32 ) + +set( SOURCES + openal_plugin.cpp ) + +install( + FILES + openal_plugin.opl + DESTINATION "lib/${PACKAGE}/openmedialib/plugins" ) + +add_library( ${NAME} SHARED ${SOURCES} ) +install( TARGETS ${NAME} RUNTIME DESTINATION "lib/${PACKAGE}/openmedialib/plugins" ) + +# OpenAL +find_package( OpenAL ) +if ( OPENAL_FOUND ) + message( "found OpenAL: ${OPENAL_INCLUDE_DIR}" ) + include_directories( ${OPENAL_INCLUDE_DIR} ) +endif ( OPENAL_FOUND ) + +# required links +link_directories( ${OpenLibraries_BINARY_DIR}/src/openpluginlib/pl + ${OpenLibraries_BINARY_DIR}/src/openimagelib/il + ${openmedialib_ml_BINARY_DIR} ) +target_link_libraries( ${NAME} "openpluginlib_pl${LIBRARY_IDENTIFIER}" ) +target_link_libraries( ${NAME} "openimagelib_il${LIBRARY_IDENTIFIER}" ) +target_link_libraries( ${NAME} "openmedialib_ml${LIBRARY_IDENTIFIER}" ) +target_link_libraries( ${NAME} ${OPENAL_LIBRARY} ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <re...@us...> - 2008-06-16 11:32:57
|
Revision: 1377 http://openlibraries.svn.sourceforge.net/openlibraries/?rev=1377&view=rev Author: rexbron Date: 2008-06-16 04:32:52 -0700 (Mon, 16 Jun 2008) Log Message: ----------- Initial work on CMake files for opl python extentions. Modified Paths: -------------- trunk/src/openpluginlib/CMakeLists.txt Added Paths: ----------- trunk/src/openpluginlib/py/CMakeLists.txt Property Changed: ---------------- trunk/ Property changes on: trunk ___________________________________________________________________ Name: bzr:revision-info - timestamp: 2008-06-14 14:02:06.701999903 +0100 committer: Andrew Hunter <an...@ae...> properties: branch-nick: trunk + timestamp: 2008-06-16 12:32:01.502000093 +0100 committer: Andrew Hunter <an...@ae...> properties: branch-nick: trunk Name: bzr:ancestry:v3-trunk0 - an...@ae...-20080613162705-8emncakb7nkknsbj + an...@ae...-20080613162705-8emncakb7nkknsbj an...@ae...-20080614133032-vef9lmcgxyrauqss Name: bzr:file-ids - .bzrignore bzrignore-20080613161045-2n6yxm79gaz9g3on-1 + src/openpluginlib/py/CMakeLists.txt cmakelists.txt-20080614100344-wn5o3qyb0xgv3cow-1 Name: bzr:revision-id:v3-trunk0 - 1373 an...@ae...-20080614130206-thshu8ln95djpgng + 1373 an...@ae...-20080614130206-thshu8ln95djpgng 1374 an...@ae...-20080616113201-cexl9qhreccah10e Modified: trunk/src/openpluginlib/CMakeLists.txt =================================================================== --- trunk/src/openpluginlib/CMakeLists.txt 2008-06-14 13:03:18 UTC (rev 1376) +++ trunk/src/openpluginlib/CMakeLists.txt 2008-06-16 11:32:52 UTC (rev 1377) @@ -1,2 +1,4 @@ add_subdirectory( pl ) -#add_subdirectory( py ) +IF ( WITH_PYTHON_EXTENTIONS ) + add_subdirectory( py ) +ENDIF ( WITH_PYTHON_EXTENTIONS ) Added: trunk/src/openpluginlib/py/CMakeLists.txt =================================================================== --- trunk/src/openpluginlib/py/CMakeLists.txt (rev 0) +++ trunk/src/openpluginlib/py/CMakeLists.txt 2008-06-16 11:32:52 UTC (rev 1377) @@ -0,0 +1,29 @@ +FIND_PACKAGE ( PythonLibs ) + +INCLUDE_DIRECTORIES ( ${OpenLibraries_SOURCE_DIR}/src ) + +SET ( NAME openpluginlib_py ) + +SET ( SOURCES + string.cpp + openpluginlib.cpp + geometry.cpp + python.hpp + py.hpp + py.cpp + pcos/any.cpp + pcos/key.cpp + pcos/observer.cpp + pcos/property.cpp + pcos/property_container.cpp + pcos/subject.cpp + pcos/visitor.cpp ) + +ADD_LIBRARY ( ${NAME} SHARED ${SOURCES} ) + +IF ( PYTHON_FOUND ) + MESSAGE ( "Found Python: ${PYTHON_INCLUDE_PATH} ${PYTHON_LIBRARIES} " ) + INCLUDE_DIRECTORIES ( ${PYTHON_INCLUDE_PATH} ) + TARGET_LINK_LIBRARIES ( ${NAME} ${PYTHON_LIBRARIES} ) +ENDIF ( PYTHON_FOUND ) + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <re...@us...> - 2008-06-16 11:35:38
|
Revision: 1378 http://openlibraries.svn.sourceforge.net/openlibraries/?rev=1378&view=rev Author: rexbron Date: 2008-06-16 04:35:25 -0700 (Mon, 16 Jun 2008) Log Message: ----------- CMAKE: Allow opl to use libopenfx headers if present. Modified Paths: -------------- trunk/src/openpluginlib/pl/CMakeLists.txt Added Paths: ----------- trunk/FindOPENFX.cmake Property Changed: ---------------- trunk/ Property changes on: trunk ___________________________________________________________________ Name: bzr:revision-info - timestamp: 2008-06-16 12:32:01.502000093 +0100 committer: Andrew Hunter <an...@ae...> properties: branch-nick: trunk + timestamp: 2008-06-16 12:34:18.467999935 +0100 committer: Andrew Hunter <an...@ae...> properties: branch-nick: trunk Name: bzr:ancestry:v3-trunk0 - an...@ae...-20080613162705-8emncakb7nkknsbj an...@ae...-20080614133032-vef9lmcgxyrauqss + an...@ae...-20080613162705-8emncakb7nkknsbj an...@ae...-20080614133032-vef9lmcgxyrauqss an...@ae...-20080614141409-u4z2pzco7bmhavlb Name: bzr:file-ids - src/openpluginlib/py/CMakeLists.txt cmakelists.txt-20080614100344-wn5o3qyb0xgv3cow-1 + FindOPENFX.cmake findofx.cmake-20080614133240-3xjcny2be6xktlls-1 Name: bzr:revision-id:v3-trunk0 - 1373 an...@ae...-20080614130206-thshu8ln95djpgng 1374 an...@ae...-20080616113201-cexl9qhreccah10e + 1373 an...@ae...-20080614130206-thshu8ln95djpgng 1374 an...@ae...-20080616113201-cexl9qhreccah10e 1375 an...@ae...-20080616113418-7qu4qxldvpxfrdp7 Added: trunk/FindOPENFX.cmake =================================================================== --- trunk/FindOPENFX.cmake (rev 0) +++ trunk/FindOPENFX.cmake 2008-06-16 11:35:25 UTC (rev 1378) @@ -0,0 +1,26 @@ +# FindOPENFX.cmake +# +# OPENFX_FOUND +# OPENFX_INCLUDE_PATH + +IF ( WIN32 ) + #Add commands to find libofx on win32 +ELSE ( WIN32 ) + IF ( APPLE ) + #Add commands to find libofx on OS X + ELSE ( APPLE ) + FIND_PATH( OPENFX_INCLUDE_PATH ofxTimeLine.h + PATHS /usr/include/ + /usr/local/include/ + PATH_SUFFIXES libopenfx + DOC "LibOpenFX include directory" ) + ENDIF ( APPLE ) +ENDIF ( WIN32 ) + +SET ( OPENFX_FOUND FALSE ) + +IF ( OPENFX_INCLUDE_PATH ) + SET ( OPENFX_FOUND TRUE ) +ENDIF ( OPENFX_INCLUDE_PATH ) + +MARK_AS_ADVANCED ( OPENFX_INCLUDE_PATH ) Modified: trunk/src/openpluginlib/pl/CMakeLists.txt =================================================================== --- trunk/src/openpluginlib/pl/CMakeLists.txt 2008-06-16 11:32:52 UTC (rev 1377) +++ trunk/src/openpluginlib/pl/CMakeLists.txt 2008-06-16 11:35:25 UTC (rev 1378) @@ -122,3 +122,9 @@ target_link_libraries( ${NAME} ${GLEW_LIBRARY} ) target_link_libraries( ${NAME} ${OPENGL_LIBRARIES} ) endif( GLEW_FOUND ) + +FIND_PACKAGE ( OPENFX ) +IF ( OPENFX_FOUND ) + MESSAGE ( "Found libOpenFX: ${OPENFX_INCLUDE_PATH}" ) + INCLUDE_DIRECTORIES ( ${OPENFX_INCLUDE_PATH} ) +ENDIF ( OPENFX_FOUND ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <re...@us...> - 2008-06-16 11:36:55
|
Revision: 1379 http://openlibraries.svn.sourceforge.net/openlibraries/?rev=1379&view=rev Author: rexbron Date: 2008-06-16 04:36:41 -0700 (Mon, 16 Jun 2008) Log Message: ----------- CMAKE: Mark libboost and libxml2 as required dependancies. Modified Paths: -------------- trunk/CMakeLists.txt Property Changed: ---------------- trunk/ Property changes on: trunk ___________________________________________________________________ Name: bzr:revision-info - timestamp: 2008-06-16 12:34:18.467999935 +0100 committer: Andrew Hunter <an...@ae...> properties: branch-nick: trunk + timestamp: 2008-06-16 12:35:59.805000067 +0100 committer: Andrew Hunter <an...@ae...> properties: branch-nick: trunk Name: bzr:ancestry:v3-trunk0 - an...@ae...-20080613162705-8emncakb7nkknsbj an...@ae...-20080614133032-vef9lmcgxyrauqss an...@ae...-20080614141409-u4z2pzco7bmhavlb + an...@ae...-20080613162705-8emncakb7nkknsbj an...@ae...-20080614133032-vef9lmcgxyrauqss an...@ae...-20080614141409-u4z2pzco7bmhavlb an...@ae...-20080616112610-ky0ylmbwjn9w1mzm Name: bzr:file-ids - FindOPENFX.cmake findofx.cmake-20080614133240-3xjcny2be6xktlls-1 + Name: bzr:revision-id:v3-trunk0 - 1373 an...@ae...-20080614130206-thshu8ln95djpgng 1374 an...@ae...-20080616113201-cexl9qhreccah10e 1375 an...@ae...-20080616113418-7qu4qxldvpxfrdp7 + 1373 an...@ae...-20080614130206-thshu8ln95djpgng 1374 an...@ae...-20080616113201-cexl9qhreccah10e 1375 an...@ae...-20080616113418-7qu4qxldvpxfrdp7 1376 an...@ae...-20080616113559-u5wad4bpwd9uzmd8 Modified: trunk/CMakeLists.txt =================================================================== --- trunk/CMakeLists.txt 2008-06-16 11:35:25 UTC (rev 1378) +++ trunk/CMakeLists.txt 2008-06-16 11:36:41 UTC (rev 1379) @@ -22,7 +22,7 @@ set( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR} ) # boost -find_package( Boost ) +find_package( Boost REQUIRED ) if ( Boost_FOUND ) message( "found boost: ${Boost_INCLUDE_DIR}" ) include_directories( ${Boost_INCLUDE_DIR} ) @@ -32,7 +32,7 @@ # libxml if ( NOT WIN32 ) - find_package( LibXml2 ) + find_package( LibXml2 REQUIRED ) if ( LIBXML2_FOUND ) message( "found LibXml2: ${LIBXML2_INCLUDE_DIR}" ) include_directories( ${LIBXML2_INCLUDE_DIR} ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <re...@us...> - 2008-06-16 12:30:49
|
Revision: 1380 http://openlibraries.svn.sourceforge.net/openlibraries/?rev=1380&view=rev Author: rexbron Date: 2008-06-16 05:30:42 -0700 (Mon, 16 Jun 2008) Log Message: ----------- Build python extentions for opl. oml and oil. Probably needs more work... Modified Paths: -------------- trunk/src/openimagelib/CMakeLists.txt trunk/src/openmedialib/CMakeLists.txt trunk/src/openpluginlib/py/CMakeLists.txt Added Paths: ----------- trunk/src/openimagelib/py/CMakeLists.txt trunk/src/openmedialib/py/CMakeLists.txt Property Changed: ---------------- trunk/ Property changes on: trunk ___________________________________________________________________ Name: bzr:revision-info - timestamp: 2008-06-16 12:35:59.805000067 +0100 committer: Andrew Hunter <an...@ae...> properties: branch-nick: trunk + timestamp: 2008-06-16 13:28:53.707000017 +0100 committer: Andrew Hunter <an...@ae...> properties: branch-nick: trunk Name: bzr:ancestry:v3-trunk0 - an...@ae...-20080613162705-8emncakb7nkknsbj an...@ae...-20080614133032-vef9lmcgxyrauqss an...@ae...-20080614141409-u4z2pzco7bmhavlb an...@ae...-20080616112610-ky0ylmbwjn9w1mzm + an...@ae...-20080613162705-8emncakb7nkknsbj an...@ae...-20080614133032-vef9lmcgxyrauqss an...@ae...-20080614141409-u4z2pzco7bmhavlb an...@ae...-20080616112610-ky0ylmbwjn9w1mzm an...@ae...-20080616122604-vyn3c4elr33ehlai Name: bzr:file-ids - + src/openimagelib/py/CMakeLists.txt cmakelists.txt-20080616122340-yvob89adq4bt30c2-1 src/openmedialib/py/CMakeLists.txt cmakelists.txt-20080616121513-vphdp07v4w50h712-1 Name: bzr:revision-id:v3-trunk0 - 1373 an...@ae...-20080614130206-thshu8ln95djpgng 1374 an...@ae...-20080616113201-cexl9qhreccah10e 1375 an...@ae...-20080616113418-7qu4qxldvpxfrdp7 1376 an...@ae...-20080616113559-u5wad4bpwd9uzmd8 + 1373 an...@ae...-20080614130206-thshu8ln95djpgng 1374 an...@ae...-20080616113201-cexl9qhreccah10e 1375 an...@ae...-20080616113418-7qu4qxldvpxfrdp7 1376 an...@ae...-20080616113559-u5wad4bpwd9uzmd8 1377 an...@ae...-20080616122853-cwqokea7hkf82eo1 Modified: trunk/src/openimagelib/CMakeLists.txt =================================================================== --- trunk/src/openimagelib/CMakeLists.txt 2008-06-16 11:36:41 UTC (rev 1379) +++ trunk/src/openimagelib/CMakeLists.txt 2008-06-16 12:30:42 UTC (rev 1380) @@ -1,3 +1,5 @@ add_subdirectory( il ) add_subdirectory( plugins ) -#add_subdirectory( py ) +IF ( WITH_PYTHON_EXTENTIONS ) + add_subdirectory( py ) +ENDIF ( WITH_PYTHON_EXTENTIONS ) Added: trunk/src/openimagelib/py/CMakeLists.txt =================================================================== --- trunk/src/openimagelib/py/CMakeLists.txt (rev 0) +++ trunk/src/openimagelib/py/CMakeLists.txt 2008-06-16 12:30:42 UTC (rev 1380) @@ -0,0 +1,20 @@ +FIND_PACKAGE ( PythonLibs REQUIRED ) + +INCLUDE_DIRECTORIES ( ${OpenLibraries_SOURCE_DIR}/src ) + +SET ( NAME openimagelib_py ) + +SET ( SOURCES + il.cpp + py.hpp + py.cpp ) + +#ADD_DEFINITIONS ( -DOPENEFFECTSLIB_SHADERS=\"${OPENEFFECTSLIB_SHADERSPATH}/\" ) #FIXME: What does this do? + +ADD_LIBRARY ( ${NAME} SHARED ${SOURCES} ) + +MESSAGE ( "Found Python: ${PYTHON_INCLUDE_PATH} ${PYTHON_LIBRARIES} " ) +INCLUDE_DIRECTORIES ( ${PYTHON_INCLUDE_PATH} ) +TARGET_LINK_LIBRARIES ( ${NAME} ${PYTHON_LIBRARIES} ) + +INSTALL ( TARGETS ${NAME} LIBRARY DESTINATION "lib/${PACKAGE}/openimagelib/py/" ) Modified: trunk/src/openmedialib/CMakeLists.txt =================================================================== --- trunk/src/openmedialib/CMakeLists.txt 2008-06-16 11:36:41 UTC (rev 1379) +++ trunk/src/openmedialib/CMakeLists.txt 2008-06-16 12:30:42 UTC (rev 1380) @@ -1,3 +1,5 @@ add_subdirectory( ml ) add_subdirectory( plugins ) -#add_subdirectory( py ) +IF ( WITH_PYTHON_EXTENTIONS ) + add_subdirectory( py ) +ENDIF ( WITH_PYTHON_EXTENTIONS ) Added: trunk/src/openmedialib/py/CMakeLists.txt =================================================================== --- trunk/src/openmedialib/py/CMakeLists.txt (rev 0) +++ trunk/src/openmedialib/py/CMakeLists.txt 2008-06-16 12:30:42 UTC (rev 1380) @@ -0,0 +1,20 @@ +FIND_PACKAGE ( PythonLibs REQUIRED ) + +INCLUDE_DIRECTORIES ( ${OpenLibraries_SOURCE_DIR}/src ) + +SET ( NAME openmedialib_py ) + +SET ( SOURCES + ml.cpp + py.hpp + py.cpp ) + +#ADD_DEFINITIONS ( -DOPENEFFECTSLIB_SHADERS=\"${OPENEFFECTSLIB_SHADERSPATH}/\" ) #FIXME: What does this do? + +ADD_LIBRARY ( ${NAME} SHARED ${SOURCES} ) + +MESSAGE ( "Found Python: ${PYTHON_INCLUDE_PATH} ${PYTHON_LIBRARIES} " ) +INCLUDE_DIRECTORIES ( ${PYTHON_INCLUDE_PATH} ) +TARGET_LINK_LIBRARIES ( ${NAME} ${PYTHON_LIBRARIES} ) + +INSTALL ( TARGETS ${NAME} LIBRARY DESTINATION "lib/${PACKAGE}/openmedialib/py/" ) Modified: trunk/src/openpluginlib/py/CMakeLists.txt =================================================================== --- trunk/src/openpluginlib/py/CMakeLists.txt 2008-06-16 11:36:41 UTC (rev 1379) +++ trunk/src/openpluginlib/py/CMakeLists.txt 2008-06-16 12:30:42 UTC (rev 1380) @@ -1,4 +1,4 @@ -FIND_PACKAGE ( PythonLibs ) +FIND_PACKAGE ( PythonLibs REQUIRED ) INCLUDE_DIRECTORIES ( ${OpenLibraries_SOURCE_DIR}/src ) @@ -19,11 +19,12 @@ pcos/subject.cpp pcos/visitor.cpp ) +#ADD_DEFINITIONS ( -DOPENEFFECTSLIB_SHADERS=\"${OPENEFFECTSLIB_SHADERSPATH}/\" ) #FIXME: What does this do? + ADD_LIBRARY ( ${NAME} SHARED ${SOURCES} ) -IF ( PYTHON_FOUND ) - MESSAGE ( "Found Python: ${PYTHON_INCLUDE_PATH} ${PYTHON_LIBRARIES} " ) - INCLUDE_DIRECTORIES ( ${PYTHON_INCLUDE_PATH} ) - TARGET_LINK_LIBRARIES ( ${NAME} ${PYTHON_LIBRARIES} ) -ENDIF ( PYTHON_FOUND ) +MESSAGE ( "Found Python: ${PYTHON_INCLUDE_PATH} ${PYTHON_LIBRARIES} " ) +INCLUDE_DIRECTORIES ( ${PYTHON_INCLUDE_PATH} ) +TARGET_LINK_LIBRARIES ( ${NAME} ${PYTHON_LIBRARIES} ) +INSTALL ( TARGETS ${NAME} LIBRARY DESTINATION "lib/${PACKAGE}/openpluginlib/py/" ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <re...@us...> - 2008-06-16 22:25:25
|
Revision: 1381 http://openlibraries.svn.sourceforge.net/openlibraries/?rev=1381&view=rev Author: rexbron Date: 2008-06-16 15:25:15 -0700 (Mon, 16 Jun 2008) Log Message: ----------- * Add FindOpenEXR.cmake * Compile oil jpg plugin. Added Paths: ----------- trunk/FindOpenEXR.cmake trunk/src/openimagelib/plugins/jpg/CMakeLists.txt Property Changed: ---------------- trunk/ Property changes on: trunk ___________________________________________________________________ Name: bzr:revision-info - timestamp: 2008-06-16 13:28:53.707000017 +0100 committer: Andrew Hunter <an...@ae...> properties: branch-nick: trunk + timestamp: 2008-06-16 23:24:00.365999937 +0100 committer: Andrew Hunter <an...@ae...> properties: branch-nick: trunk Name: bzr:ancestry:v3-trunk0 - an...@ae...-20080613162705-8emncakb7nkknsbj an...@ae...-20080614133032-vef9lmcgxyrauqss an...@ae...-20080614141409-u4z2pzco7bmhavlb an...@ae...-20080616112610-ky0ylmbwjn9w1mzm an...@ae...-20080616122604-vyn3c4elr33ehlai + an...@ae...-20080613162705-8emncakb7nkknsbj an...@ae...-20080614133032-vef9lmcgxyrauqss an...@ae...-20080614141409-u4z2pzco7bmhavlb an...@ae...-20080616112610-ky0ylmbwjn9w1mzm an...@ae...-20080616122604-vyn3c4elr33ehlai an...@ae...-20080616222235-pb4vb2oeu6cj88m4 Name: bzr:file-ids - src/openimagelib/py/CMakeLists.txt cmakelists.txt-20080616122340-yvob89adq4bt30c2-1 src/openmedialib/py/CMakeLists.txt cmakelists.txt-20080616121513-vphdp07v4w50h712-1 + FindOpenEXR.cmake findopenexr.cmake-20080616221215-17ge0xzpvuxlhnjz-1 src/openimagelib/plugins/jpg/CMakeLists.txt cmakelists.txt-20080616215536-2e4278apyb0elsd6-1 Name: bzr:revision-id:v3-trunk0 - 1373 an...@ae...-20080614130206-thshu8ln95djpgng 1374 an...@ae...-20080616113201-cexl9qhreccah10e 1375 an...@ae...-20080616113418-7qu4qxldvpxfrdp7 1376 an...@ae...-20080616113559-u5wad4bpwd9uzmd8 1377 an...@ae...-20080616122853-cwqokea7hkf82eo1 + 1373 an...@ae...-20080614130206-thshu8ln95djpgng 1374 an...@ae...-20080616113201-cexl9qhreccah10e 1375 an...@ae...-20080616113418-7qu4qxldvpxfrdp7 1376 an...@ae...-20080616113559-u5wad4bpwd9uzmd8 1377 an...@ae...-20080616122853-cwqokea7hkf82eo1 1378 an...@ae...-20080616222400-9q0vwtkk6091txce Added: trunk/FindOpenEXR.cmake =================================================================== --- trunk/FindOpenEXR.cmake (rev 0) +++ trunk/FindOpenEXR.cmake 2008-06-16 22:25:15 UTC (rev 1381) @@ -0,0 +1,44 @@ +# - Try to find OpenEXR +# Once done this will define +# +# OPENEXR_FOUND - system has OpenEXR +# OPENEXR_INCLUDE_DIR - the OpenEXR include directory +# OPENEXR_LIBRARIES - Link these to use OpenEXR +# OPENEXR_DEFINITIONS - Compiler switches required for using OpenEXR +# Redistribution and use is allowed according to the terms of the BSD license. +# For details see the accompanying COPYING-CMAKE-SCRIPTS file. +# + + +if ( OPENEXR_INCLUDE_DIR AND OPENEXR_LIBRARIES ) + # in cache already + SET(OpenEXR_FIND_QUIETLY TRUE) +endif ( OPENEXR_INCLUDE_DIR AND OPENEXR_LIBRARIES ) + +# use pkg-config to get the directories and then use these values +# in the FIND_PATH() and FIND_LIBRARY() calls +if( NOT WIN32 ) + INCLUDE(UsePkgConfig) + + PKGCONFIG(OpenEXR _OpenEXRIncDir _OpenEXRLinkDir _OpenEXRLinkFlags _OpenEXRCflags) + + SET(OPENEXR_DEFINITIONS ${_OpenEXRCflags}) +endif( NOT WIN32 ) + +FIND_PATH(OPENEXR_INCLUDE_DIR NAMES OpenEXRConfig.h + PATHS + ${_OpenEXRIncDir} + PATH_SUFFIXES OpenEXR +) + +FIND_LIBRARY(OPENEXR_LIBRARIES NAMES IlmIlf + PATHS + ${_OpenEXRLinkDir} +) + +include(FindPackageHandleStandardArgs) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenEXR DEFAULT_MSG OPENEXR_INCLUDE_DIR OPENEXR_LIBRARIES ) + +# show the OPENEXR_INCLUDE_DIR and OPENEXR_LIBRARIES variables only in the advanced view +MARK_AS_ADVANCED(OPENEXR_INCLUDE_DIR OPENEXR_LIBRARIES ) + Added: trunk/src/openimagelib/plugins/jpg/CMakeLists.txt =================================================================== --- trunk/src/openimagelib/plugins/jpg/CMakeLists.txt (rev 0) +++ trunk/src/openimagelib/plugins/jpg/CMakeLists.txt 2008-06-16 22:25:15 UTC (rev 1381) @@ -0,0 +1,17 @@ +INCLUDE_DIRECTORIES ( ${OpenLibraries_SOURCE_DIR}/src ) + +FIND_PACKAGE ( JPEG ) + +SET ( NAME openimagelib_jpg ) + +IF ( JPEG_FOUND ) + MESSAGE ( "Found libJPEG: ${JPEG_LIBRAIES} ${JPEG_INCLUDE_DIR}" ) + SET ( SOURCES jpg_plugin.cpp ) + ADD_LIBRARY ( ${NAME} SHARED ${SOURCES} ) + INCLUDE_DIRECTORIES ( ${JPEG_INCLUDE_DIR} ) + LINK_DIRECTORIES ( ${JPEG_LIBRAIES} ) + INSTALL ( FILES jpg_plugins.opl DESTINATION "lib/${PACKAGE}/openimagelib/plugins/" ) + INCLUDE ( TARGETS ${NAME} DESTINATION "lib/${PACKAGE}/openimagelib/plugins" ) +ELSE ( JPEG_FOUND ) + MESSAGE ( "libJPEG not found, skipping jpg plugin." +ENDIF ( JPEG_FOUND ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ele...@us...> - 2008-06-16 22:53:42
|
Revision: 1382 http://openlibraries.svn.sourceforge.net/openlibraries/?rev=1382&view=rev Author: elektronker Date: 2008-06-16 15:53:38 -0700 (Mon, 16 Jun 2008) Log Message: ----------- Initial Doxygen Setup Added Paths: ----------- trunk/doxygen/ trunk/doxygen/openlibraries trunk/doxygen/readme.txt Added: trunk/doxygen/openlibraries =================================================================== --- trunk/doxygen/openlibraries (rev 0) +++ trunk/doxygen/openlibraries 2008-06-16 22:53:38 UTC (rev 1382) @@ -0,0 +1,1417 @@ +# Doxyfile 1.5.6 + +# This file describes the settings to be used by the documentation system +# doxygen (www.doxygen.org) for a project +# +# All text after a hash (#) is considered a comment and will be ignored +# The format is: +# TAG = value [value, ...] +# For lists items can also be appended using: +# TAG += value [value, ...] +# Values that contain spaces should be placed between quotes (" ") + +#--------------------------------------------------------------------------- +# Project related configuration options +#--------------------------------------------------------------------------- + +# This tag specifies the encoding used for all characters in the config file +# that follow. The default is UTF-8 which is also the encoding used for all +# text before the first occurrence of this tag. Doxygen uses libiconv (or the +# iconv built into libc) for the transcoding. See +# http://www.gnu.org/software/libiconv for the list of possible encodings. + +DOXYFILE_ENCODING = UTF-8 + +# The PROJECT_NAME tag is a single word (or a sequence of words surrounded +# by quotes) that should identify the project. + +PROJECT_NAME = Openlibraries + +# The PROJECT_NUMBER tag can be used to enter a project or revision number. +# This could be handy for archiving the generated documentation or +# if some version control system is used. + +PROJECT_NUMBER = + +# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) +# base path where the generated documentation will be put. +# If a relative path is entered, it will be relative to the location +# where doxygen was started. If left blank the current directory will be used. + +OUTPUT_DIRECTORY = ./../../oldocs + +# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create +# 4096 sub-directories (in 2 levels) under the output directory of each output +# format and will distribute the generated files over these directories. +# Enabling this option can be useful when feeding doxygen a huge amount of +# source files, where putting all generated files in the same directory would +# otherwise cause performance problems for the file system. + +CREATE_SUBDIRS = YES + +# The OUTPUT_LANGUAGE tag is used to specify the language in which all +# documentation generated by doxygen is written. Doxygen will use this +# information to generate all constant output in the proper language. +# The default language is English, other supported languages are: +# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional, +# Croatian, Czech, Danish, Dutch, Farsi, Finnish, French, German, Greek, +# Hungarian, Italian, Japanese, Japanese-en (Japanese with English messages), +# Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian, Polish, +# Portuguese, Romanian, Russian, Serbian, Slovak, Slovene, Spanish, Swedish, +# and Ukrainian. + +OUTPUT_LANGUAGE = English + +# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will +# include brief member descriptions after the members that are listed in +# the file and class documentation (similar to JavaDoc). +# Set to NO to disable this. + +BRIEF_MEMBER_DESC = YES + +# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend +# the brief description of a member or function before the detailed description. +# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the +# brief descriptions will be completely suppressed. + +REPEAT_BRIEF = YES + +# This tag implements a quasi-intelligent brief description abbreviator +# that is used to form the text in various listings. Each string +# in this list, if found as the leading text of the brief description, will be +# stripped from the text and the result after processing the whole list, is +# used as the annotated text. Otherwise, the brief description is used as-is. +# If left blank, the following values are used ("$name" is automatically +# replaced with the name of the entity): "The $name class" "The $name widget" +# "The $name file" "is" "provides" "specifies" "contains" +# "represents" "a" "an" "the" + +ABBREVIATE_BRIEF = + +# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then +# Doxygen will generate a detailed section even if there is only a brief +# description. + +ALWAYS_DETAILED_SEC = NO + +# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all +# inherited members of a class in the documentation of that class as if those +# members were ordinary class members. Constructors, destructors and assignment +# operators of the base classes will not be shown. + +INLINE_INHERITED_MEMB = NO + +# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full +# path before files name in the file list and in the header files. If set +# to NO the shortest path that makes the file name unique will be used. + +FULL_PATH_NAMES = YES + +# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag +# can be used to strip a user-defined part of the path. Stripping is +# only done if one of the specified strings matches the left-hand part of +# the path. The tag can be used to show relative paths in the file list. +# If left blank the directory from which doxygen is run is used as the +# path to strip. + +STRIP_FROM_PATH = + +# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of +# the path mentioned in the documentation of a class, which tells +# the reader which header file to include in order to use a class. +# If left blank only the name of the header file containing the class +# definition is used. Otherwise one should specify the include paths that +# are normally passed to the compiler using the -I flag. + +STRIP_FROM_INC_PATH = + +# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter +# (but less readable) file names. This can be useful is your file systems +# doesn't support long names like on DOS, Mac, or CD-ROM. + +SHORT_NAMES = YES + +# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen +# will interpret the first line (until the first dot) of a JavaDoc-style +# comment as the brief description. If set to NO, the JavaDoc +# comments will behave just like regular Qt-style comments +# (thus requiring an explicit @brief command for a brief description.) + +JAVADOC_AUTOBRIEF = NO + +# If the QT_AUTOBRIEF tag is set to YES then Doxygen will +# interpret the first line (until the first dot) of a Qt-style +# comment as the brief description. If set to NO, the comments +# will behave just like regular Qt-style comments (thus requiring +# an explicit \brief command for a brief description.) + +QT_AUTOBRIEF = NO + +# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen +# treat a multi-line C++ special comment block (i.e. a block of //! or /// +# comments) as a brief description. This used to be the default behaviour. +# The new default is to treat a multi-line C++ comment block as a detailed +# description. Set this tag to YES if you prefer the old behaviour instead. + +MULTILINE_CPP_IS_BRIEF = NO + +# If the DETAILS_AT_TOP tag is set to YES then Doxygen +# will output the detailed description near the top, like JavaDoc. +# If set to NO, the detailed description appears after the member +# documentation. + +DETAILS_AT_TOP = NO + +# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented +# member inherits the documentation from any documented member that it +# re-implements. + +INHERIT_DOCS = YES + +# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce +# a new page for each member. If set to NO, the documentation of a member will +# be part of the file/class/namespace that contains it. + +SEPARATE_MEMBER_PAGES = NO + +# The TAB_SIZE tag can be used to set the number of spaces in a tab. +# Doxygen uses this value to replace tabs by spaces in code fragments. + +TAB_SIZE = 8 + +# This tag can be used to specify a number of aliases that acts +# as commands in the documentation. An alias has the form "name=value". +# For example adding "sideeffect=\par Side Effects:\n" will allow you to +# put the command \sideeffect (or @sideeffect) in the documentation, which +# will result in a user-defined paragraph with heading "Side Effects:". +# You can put \n's in the value part of an alias to insert newlines. + +ALIASES = + +# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C +# sources only. Doxygen will then generate output that is more tailored for C. +# For instance, some of the names that are used will be different. The list +# of all members will be omitted, etc. + +OPTIMIZE_OUTPUT_FOR_C = NO + +# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java +# sources only. Doxygen will then generate output that is more tailored for +# Java. For instance, namespaces will be presented as packages, qualified +# scopes will look different, etc. + +OPTIMIZE_OUTPUT_JAVA = NO + +# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran +# sources only. Doxygen will then generate output that is more tailored for +# Fortran. + +OPTIMIZE_FOR_FORTRAN = NO + +# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL +# sources. Doxygen will then generate output that is tailored for +# VHDL. + +OPTIMIZE_OUTPUT_VHDL = NO + +# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want +# to include (a tag file for) the STL sources as input, then you should +# set this tag to YES in order to let doxygen match functions declarations and +# definitions whose arguments contain STL classes (e.g. func(std::string); v.s. +# func(std::string) {}). This also make the inheritance and collaboration +# diagrams that involve STL classes more complete and accurate. + +BUILTIN_STL_SUPPORT = NO + +# If you use Microsoft's C++/CLI language, you should set this option to YES to +# enable parsing support. + +CPP_CLI_SUPPORT = NO + +# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only. +# Doxygen will parse them like normal C++ but will assume all classes use public +# instead of private inheritance when no explicit protection keyword is present. + +SIP_SUPPORT = NO + +# For Microsoft's IDL there are propget and propput attributes to indicate getter +# and setter methods for a property. Setting this option to YES (the default) +# will make doxygen to replace the get and set methods by a property in the +# documentation. This will only work if the methods are indeed getting or +# setting a simple type. If this is not the case, or you want to show the +# methods anyway, you should set this option to NO. + +IDL_PROPERTY_SUPPORT = YES + +# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC +# tag is set to YES, then doxygen will reuse the documentation of the first +# member in the group (if any) for the other members of the group. By default +# all members of a group must be documented explicitly. + +DISTRIBUTE_GROUP_DOC = NO + +# Set the SUBGROUPING tag to YES (the default) to allow class member groups of +# the same type (for instance a group of public functions) to be put as a +# subgroup of that type (e.g. under the Public Functions section). Set it to +# NO to prevent subgrouping. Alternatively, this can be done per class using +# the \nosubgrouping command. + +SUBGROUPING = YES + +# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum +# is documented as struct, union, or enum with the name of the typedef. So +# typedef struct TypeS {} TypeT, will appear in the documentation as a struct +# with name TypeT. When disabled the typedef will appear as a member of a file, +# namespace, or class. And the struct will be named TypeS. This can typically +# be useful for C code in case the coding convention dictates that all compound +# types are typedef'ed and only the typedef is referenced, never the tag name. + +TYPEDEF_HIDES_STRUCT = NO + +#--------------------------------------------------------------------------- +# Build related configuration options +#--------------------------------------------------------------------------- + +# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in +# documentation are documented, even if no documentation was available. +# Private class members and static file members will be hidden unless +# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES + +EXTRACT_ALL = YES + +# If the EXTRACT_PRIVATE tag is set to YES all private members of a class +# will be included in the documentation. + +EXTRACT_PRIVATE = YES + +# If the EXTRACT_STATIC tag is set to YES all static members of a file +# will be included in the documentation. + +EXTRACT_STATIC = NO + +# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) +# defined locally in source files will be included in the documentation. +# If set to NO only classes defined in header files are included. + +EXTRACT_LOCAL_CLASSES = YES + +# This flag is only useful for Objective-C code. When set to YES local +# methods, which are defined in the implementation section but not in +# the interface are included in the documentation. +# If set to NO (the default) only methods in the interface are included. + +EXTRACT_LOCAL_METHODS = NO + +# If this flag is set to YES, the members of anonymous namespaces will be +# extracted and appear in the documentation as a namespace called +# 'anonymous_namespace{file}', where file will be replaced with the base +# name of the file that contains the anonymous namespace. By default +# anonymous namespace are hidden. + +EXTRACT_ANON_NSPACES = NO + +# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all +# undocumented members of documented classes, files or namespaces. +# If set to NO (the default) these members will be included in the +# various overviews, but no documentation section is generated. +# This option has no effect if EXTRACT_ALL is enabled. + +HIDE_UNDOC_MEMBERS = NO + +# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all +# undocumented classes that are normally visible in the class hierarchy. +# If set to NO (the default) these classes will be included in the various +# overviews. This option has no effect if EXTRACT_ALL is enabled. + +HIDE_UNDOC_CLASSES = NO + +# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all +# friend (class|struct|union) declarations. +# If set to NO (the default) these declarations will be included in the +# documentation. + +HIDE_FRIEND_COMPOUNDS = NO + +# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any +# documentation blocks found inside the body of a function. +# If set to NO (the default) these blocks will be appended to the +# function's detailed documentation block. + +HIDE_IN_BODY_DOCS = NO + +# The INTERNAL_DOCS tag determines if documentation +# that is typed after a \internal command is included. If the tag is set +# to NO (the default) then the documentation will be excluded. +# Set it to YES to include the internal documentation. + +INTERNAL_DOCS = NO + +# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate +# file names in lower-case letters. If set to YES upper-case letters are also +# allowed. This is useful if you have classes or files whose names only differ +# in case and if your file system supports case sensitive file names. Windows +# and Mac users are advised to set this option to NO. + +CASE_SENSE_NAMES = NO + +# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen +# will show members with their full class and namespace scopes in the +# documentation. If set to YES the scope will be hidden. + +HIDE_SCOPE_NAMES = NO + +# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen +# will put a list of the files that are included by a file in the documentation +# of that file. + +SHOW_INCLUDE_FILES = YES + +# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] +# is inserted in the documentation for inline members. + +INLINE_INFO = YES + +# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen +# will sort the (detailed) documentation of file and class members +# alphabetically by member name. If set to NO the members will appear in +# declaration order. + +SORT_MEMBER_DOCS = YES + +# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the +# brief documentation of file, namespace and class members alphabetically +# by member name. If set to NO (the default) the members will appear in +# declaration order. + +SORT_BRIEF_DOCS = NO + +# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the +# hierarchy of group names into alphabetical order. If set to NO (the default) +# the group names will appear in their defined order. + +SORT_GROUP_NAMES = NO + +# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be +# sorted by fully-qualified names, including namespaces. If set to +# NO (the default), the class list will be sorted only by class name, +# not including the namespace part. +# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES. +# Note: This option applies only to the class list, not to the +# alphabetical list. + +SORT_BY_SCOPE_NAME = NO + +# The GENERATE_TODOLIST tag can be used to enable (YES) or +# disable (NO) the todo list. This list is created by putting \todo +# commands in the documentation. + +GENERATE_TODOLIST = YES + +# The GENERATE_TESTLIST tag can be used to enable (YES) or +# disable (NO) the test list. This list is created by putting \test +# commands in the documentation. + +GENERATE_TESTLIST = YES + +# The GENERATE_BUGLIST tag can be used to enable (YES) or +# disable (NO) the bug list. This list is created by putting \bug +# commands in the documentation. + +GENERATE_BUGLIST = YES + +# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or +# disable (NO) the deprecated list. This list is created by putting +# \deprecated commands in the documentation. + +GENERATE_DEPRECATEDLIST = YES + +# The ENABLED_SECTIONS tag can be used to enable conditional +# documentation sections, marked by \if sectionname ... \endif. + +ENABLED_SECTIONS = + +# The MAX_INITIALIZER_LINES tag determines the maximum number of lines +# the initial value of a variable or define consists of for it to appear in +# the documentation. If the initializer consists of more lines than specified +# here it will be hidden. Use a value of 0 to hide initializers completely. +# The appearance of the initializer of individual variables and defines in the +# documentation can be controlled using \showinitializer or \hideinitializer +# command in the documentation regardless of this setting. + +MAX_INITIALIZER_LINES = 30 + +# Set the SHOW_USED_FILES tag to NO to disable the list of files generated +# at the bottom of the documentation of classes and structs. If set to YES the +# list will mention the files that were used to generate the documentation. + +SHOW_USED_FILES = YES + +# If the sources in your project are distributed over multiple directories +# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy +# in the documentation. The default is NO. + +SHOW_DIRECTORIES = YES + +# Set the SHOW_FILES tag to NO to disable the generation of the Files page. +# This will remove the Files entry from the Quick Index and from the +# Folder Tree View (if specified). The default is YES. + +SHOW_FILES = YES + +# Set the SHOW_NAMESPACES tag to NO to disable the generation of the +# Namespaces page. This will remove the Namespaces entry from the Quick Index +# and from the Folder Tree View (if specified). The default is YES. + +SHOW_NAMESPACES = YES + +# The FILE_VERSION_FILTER tag can be used to specify a program or script that +# doxygen should invoke to get the current version for each file (typically from +# the version control system). Doxygen will invoke the program by executing (via +# popen()) the command <command> <input-file>, where <command> is the value of +# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file +# provided by doxygen. Whatever the program writes to standard output +# is used as the file version. See the manual for examples. + +FILE_VERSION_FILTER = + +#--------------------------------------------------------------------------- +# configuration options related to warning and progress messages +#--------------------------------------------------------------------------- + +# The QUIET tag can be used to turn on/off the messages that are generated +# by doxygen. Possible values are YES and NO. If left blank NO is used. + +QUIET = NO + +# The WARNINGS tag can be used to turn on/off the warning messages that are +# generated by doxygen. Possible values are YES and NO. If left blank +# NO is used. + +WARNINGS = YES + +# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings +# for undocumented members. If EXTRACT_ALL is set to YES then this flag will +# automatically be disabled. + +WARN_IF_UNDOCUMENTED = YES + +# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for +# potential errors in the documentation, such as not documenting some +# parameters in a documented function, or documenting parameters that +# don't exist or using markup commands wrongly. + +WARN_IF_DOC_ERROR = YES + +# This WARN_NO_PARAMDOC option can be abled to get warnings for +# functions that are documented, but have no documentation for their parameters +# or return value. If set to NO (the default) doxygen will only warn about +# wrong or incomplete parameter documentation, but not about the absence of +# documentation. + +WARN_NO_PARAMDOC = YES + +# The WARN_FORMAT tag determines the format of the warning messages that +# doxygen can produce. The string should contain the $file, $line, and $text +# tags, which will be replaced by the file and line number from which the +# warning originated and the warning text. Optionally the format may contain +# $version, which will be replaced by the version of the file (if it could +# be obtained via FILE_VERSION_FILTER) + +WARN_FORMAT = "$file:$line: $text" + +# The WARN_LOGFILE tag can be used to specify a file to which warning +# and error messages should be written. If left blank the output is written +# to stderr. + +WARN_LOGFILE = ./../../oldocs/warnings.log + +#--------------------------------------------------------------------------- +# configuration options related to the input files +#--------------------------------------------------------------------------- + +# The INPUT tag can be used to specify the files and/or directories that contain +# documented source files. You may enter file names like "myfile.cpp" or +# directories like "/usr/src/myproject". Separate the files or directories +# with spaces. + +INPUT = "D:\Dokumente und Einstellungen\Maik\workspace\OL" + +# This tag can be used to specify the character encoding of the source files +# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is +# also the default input encoding. Doxygen uses libiconv (or the iconv built +# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for +# the list of possible encodings. + +INPUT_ENCODING = UTF-8 + +# If the value of the INPUT tag contains directories, you can use the +# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp +# and *.h) to filter out the source-files in the directories. If left +# blank the following patterns are tested: +# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx +# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90 + +FILE_PATTERNS = + +# The RECURSIVE tag can be used to turn specify whether or not subdirectories +# should be searched for input files as well. Possible values are YES and NO. +# If left blank NO is used. + +RECURSIVE = YES + +# The EXCLUDE tag can be used to specify files and/or directories that should +# excluded from the INPUT source files. This way you can easily exclude a +# subdirectory from a directory tree whose root is specified with the INPUT tag. + +EXCLUDE = ".\..\winbuild.py" ".\..\src\openlibraries\src\openassetlib\py" ".\..\src\openlibraries\src\openimagelib\py" ".\..\src\openlibraries\src\openmedialib\py" ".\..\src\openlibraries\src\openpluginlib\py" ".\..\src\openlibraries\test" + +# The EXCLUDE_SYMLINKS tag can be used select whether or not files or +# directories that are symbolic links (a Unix filesystem feature) are excluded +# from the input. + +EXCLUDE_SYMLINKS = NO + +# If the value of the INPUT tag contains directories, you can use the +# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude +# certain files from those directories. Note that the wildcards are matched +# against the file with absolute path, so to exclude all test directories +# for example use the pattern */test/* + +EXCLUDE_PATTERNS = *.py *.sln *.rtf *.am + +# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names +# (namespaces, classes, functions, etc.) that should be excluded from the +# output. The symbol name can be a fully qualified name, a word, or if the +# wildcard * is used, a substring. Examples: ANamespace, AClass, +# AClass::ANamespace, ANamespace::*Test + +EXCLUDE_SYMBOLS = + +# The EXAMPLE_PATH tag can be used to specify one or more files or +# directories that contain example code fragments that are included (see +# the \include command). + +EXAMPLE_PATH = + +# If the value of the EXAMPLE_PATH tag contains directories, you can use the +# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp +# and *.h) to filter out the source-files in the directories. If left +# blank all files are included. + +EXAMPLE_PATTERNS = + +# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be +# searched for input files to be used with the \include or \dontinclude +# commands irrespective of the value of the RECURSIVE tag. +# Possible values are YES and NO. If left blank NO is used. + +EXAMPLE_RECURSIVE = NO + +# The IMAGE_PATH tag can be used to specify one or more files or +# directories that contain image that are included in the documentation (see +# the \image command). + +IMAGE_PATH = + +# The INPUT_FILTER tag can be used to specify a program that doxygen should +# invoke to filter for each input file. Doxygen will invoke the filter program +# by executing (via popen()) the command <filter> <input-file>, where <filter> +# is the value of the INPUT_FILTER tag, and <input-file> is the name of an +# input file. Doxygen will then use the output that the filter program writes +# to standard output. If FILTER_PATTERNS is specified, this tag will be +# ignored. + +INPUT_FILTER = + +# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern +# basis. Doxygen will compare the file name with each pattern and apply the +# filter if there is a match. The filters are a list of the form: +# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further +# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER +# is applied to all files. + +FILTER_PATTERNS = + +# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using +# INPUT_FILTER) will be used to filter the input files when producing source +# files to browse (i.e. when SOURCE_BROWSER is set to YES). + +FILTER_SOURCE_FILES = NO + +#--------------------------------------------------------------------------- +# configuration options related to source browsing +#--------------------------------------------------------------------------- + +# If the SOURCE_BROWSER tag is set to YES then a list of source files will +# be generated. Documented entities will be cross-referenced with these sources. +# Note: To get rid of all source code in the generated output, make sure also +# VERBATIM_HEADERS is set to NO. + +SOURCE_BROWSER = YES + +# Setting the INLINE_SOURCES tag to YES will include the body +# of functions and classes directly in the documentation. + +INLINE_SOURCES = NO + +# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct +# doxygen to hide any special comment blocks from generated source code +# fragments. Normal C and C++ comments will always remain visible. + +STRIP_CODE_COMMENTS = YES + +# If the REFERENCED_BY_RELATION tag is set to YES +# then for each documented function all documented +# functions referencing it will be listed. + +REFERENCED_BY_RELATION = YES + +# If the REFERENCES_RELATION tag is set to YES +# then for each documented function all documented entities +# called/used by that function will be listed. + +REFERENCES_RELATION = YES + +# If the REFERENCES_LINK_SOURCE tag is set to YES (the default) +# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from +# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will +# link to the source code. Otherwise they will link to the documentstion. + +REFERENCES_LINK_SOURCE = YES + +# If the USE_HTAGS tag is set to YES then the references to source code +# will point to the HTML generated by the htags(1) tool instead of doxygen +# built-in source browser. The htags tool is part of GNU's global source +# tagging system (see http://www.gnu.org/software/global/global.html). You +# will need version 4.8.6 or higher. + +USE_HTAGS = NO + +# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen +# will generate a verbatim copy of the header file for each class for +# which an include is specified. Set to NO to disable this. + +VERBATIM_HEADERS = YES + +#--------------------------------------------------------------------------- +# configuration options related to the alphabetical class index +#--------------------------------------------------------------------------- + +# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index +# of all compounds will be generated. Enable this if the project +# contains a lot of classes, structs, unions or interfaces. + +ALPHABETICAL_INDEX = NO + +# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then +# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns +# in which this list will be split (can be a number in the range [1..20]) + +COLS_IN_ALPHA_INDEX = 5 + +# In case all classes in a project start with a common prefix, all +# classes will be put under the same header in the alphabetical index. +# The IGNORE_PREFIX tag can be used to specify one or more prefixes that +# should be ignored while generating the index headers. + +IGNORE_PREFIX = + +#--------------------------------------------------------------------------- +# configuration options related to the HTML output +#--------------------------------------------------------------------------- + +# If the GENERATE_HTML tag is set to YES (the default) Doxygen will +# generate HTML output. + +GENERATE_HTML = YES + +# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `html' will be used as the default path. + +HTML_OUTPUT = html + +# The HTML_FILE_EXTENSION tag can be used to specify the file extension for +# each generated HTML page (for example: .htm,.php,.asp). If it is left blank +# doxygen will generate files with .html extension. + +HTML_FILE_EXTENSION = .html + +# The HTML_HEADER tag can be used to specify a personal HTML header for +# each generated HTML page. If it is left blank doxygen will generate a +# standard header. + +HTML_HEADER = + +# The HTML_FOOTER tag can be used to specify a personal HTML footer for +# each generated HTML page. If it is left blank doxygen will generate a +# standard footer. + +HTML_FOOTER = + +# The HTML_STYLESHEET tag can be used to specify a user-defined cascading +# style sheet that is used by each HTML page. It can be used to +# fine-tune the look of the HTML output. If the tag is left blank doxygen +# will generate a default style sheet. Note that doxygen will try to copy +# the style sheet file to the HTML output directory, so don't put your own +# stylesheet in the HTML output directory as well, or it will be erased! + +HTML_STYLESHEET = + +# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, +# files or namespaces will be aligned in HTML using tables. If set to +# NO a bullet list will be used. + +HTML_ALIGN_MEMBERS = YES + +# If the GENERATE_HTMLHELP tag is set to YES, additional index files +# will be generated that can be used as input for tools like the +# Microsoft HTML help workshop to generate a compiled HTML help file (.chm) +# of the generated HTML documentation. + +GENERATE_HTMLHELP = NO + +# If the GENERATE_DOCSET tag is set to YES, additional index files +# will be generated that can be used as input for Apple's Xcode 3 +# integrated development environment, introduced with OSX 10.5 (Leopard). +# To create a documentation set, doxygen will generate a Makefile in the +# HTML output directory. Running make will produce the docset in that +# directory and running "make install" will install the docset in +# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find +# it at startup. + +GENERATE_DOCSET = NO + +# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the +# feed. A documentation feed provides an umbrella under which multiple +# documentation sets from a single provider (such as a company or product suite) +# can be grouped. + +DOCSET_FEEDNAME = "Doxygen generated docs" + +# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that +# should uniquely identify the documentation set bundle. This should be a +# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen +# will append .docset to the name. + +DOCSET_BUNDLE_ID = org.doxygen.Project + +# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML +# documentation will contain sections that can be hidden and shown after the +# page has loaded. For this to work a browser that supports +# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox +# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari). + +HTML_DYNAMIC_SECTIONS = YES + +# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can +# be used to specify the file name of the resulting .chm file. You +# can add a path in front of the file if the result should not be +# written to the html output directory. + +CHM_FILE = + +# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can +# be used to specify the location (absolute path including file name) of +# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run +# the HTML help compiler on the generated index.hhp. + +HHC_LOCATION = + +# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag +# controls if a separate .chi index file is generated (YES) or that +# it should be included in the master .chm file (NO). + +GENERATE_CHI = NO + +# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING +# is used to encode HtmlHelp index (hhk), content (hhc) and project file +# content. + +CHM_INDEX_ENCODING = + +# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag +# controls whether a binary table of contents is generated (YES) or a +# normal table of contents (NO) in the .chm file. + +BINARY_TOC = NO + +# The TOC_EXPAND flag can be set to YES to add extra items for group members +# to the contents of the HTML help documentation and to the tree view. + +TOC_EXPAND = YES + +# The DISABLE_INDEX tag can be used to turn on/off the condensed index at +# top of each HTML page. The value NO (the default) enables the index and +# the value YES disables it. + +DISABLE_INDEX = NO + +# This tag can be used to set the number of enum values (range [1..20]) +# that doxygen will group on one line in the generated HTML documentation. + +ENUM_VALUES_PER_LINE = 4 + +# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index +# structure should be generated to display hierarchical information. +# If the tag value is set to FRAME, a side panel will be generated +# containing a tree-like index structure (just like the one that +# is generated for HTML Help). For this to work a browser that supports +# JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+, +# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are +# probably better off using the HTML help feature. Other possible values +# for this tag are: HIERARCHIES, which will generate the Groups, Directories, +# and Class Hiererachy pages using a tree view instead of an ordered list; +# ALL, which combines the behavior of FRAME and HIERARCHIES; and NONE, which +# disables this behavior completely. For backwards compatibility with previous +# releases of Doxygen, the values YES and NO are equivalent to FRAME and NONE +# respectively. + +GENERATE_TREEVIEW = YES + +# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be +# used to set the initial width (in pixels) of the frame in which the tree +# is shown. + +TREEVIEW_WIDTH = 375 + +# Use this tag to change the font size of Latex formulas included +# as images in the HTML documentation. The default is 10. Note that +# when you change the font size after a successful doxygen run you need +# to manually remove any form_*.png images from the HTML output directory +# to force them to be regenerated. + +FORMULA_FONTSIZE = 10 + +#--------------------------------------------------------------------------- +# configuration options related to the LaTeX output +#--------------------------------------------------------------------------- + +# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will +# generate Latex output. + +GENERATE_LATEX = NO + +# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `latex' will be used as the default path. + +LATEX_OUTPUT = latex + +# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be +# invoked. If left blank `latex' will be used as the default command name. + +LATEX_CMD_NAME = latex + +# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to +# generate index for LaTeX. If left blank `makeindex' will be used as the +# default command name. + +MAKEINDEX_CMD_NAME = makeindex + +# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact +# LaTeX documents. This may be useful for small projects and may help to +# save some trees in general. + +COMPACT_LATEX = NO + +# The PAPER_TYPE tag can be used to set the paper type that is used +# by the printer. Possible values are: a4, a4wide, letter, legal and +# executive. If left blank a4wide will be used. + +PAPER_TYPE = a4wide + +# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX +# packages that should be included in the LaTeX output. + +EXTRA_PACKAGES = + +# The LATEX_HEADER tag can be used to specify a personal LaTeX header for +# the generated latex document. The header should contain everything until +# the first chapter. If it is left blank doxygen will generate a +# standard header. Notice: only use this tag if you know what you are doing! + +LATEX_HEADER = + +# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated +# is prepared for conversion to pdf (using ps2pdf). The pdf file will +# contain links (just like the HTML output) instead of page references +# This makes the output suitable for online browsing using a pdf viewer. + +PDF_HYPERLINKS = YES + +# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of +# plain latex in the generated Makefile. Set this option to YES to get a +# higher quality PDF documentation. + +USE_PDFLATEX = YES + +# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. +# command to the generated LaTeX files. This will instruct LaTeX to keep +# running if errors occur, instead of asking the user for help. +# This option is also used when generating formulas in HTML. + +LATEX_BATCHMODE = NO + +# If LATEX_HIDE_INDICES is set to YES then doxygen will not +# include the index chapters (such as File Index, Compound Index, etc.) +# in the output. + +LATEX_HIDE_INDICES = NO + +#--------------------------------------------------------------------------- +# configuration options related to the RTF output +#--------------------------------------------------------------------------- + +# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output +# The RTF output is optimized for Word 97 and may not look very pretty with +# other RTF readers or editors. + +GENERATE_RTF = NO + +# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `rtf' will be used as the default path. + +RTF_OUTPUT = rtf + +# If the COMPACT_RTF tag is set to YES Doxygen generates more compact +# RTF documents. This may be useful for small projects and may help to +# save some trees in general. + +COMPACT_RTF = NO + +# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated +# will contain hyperlink fields. The RTF file will +# contain links (just like the HTML output) instead of page references. +# This makes the output suitable for online browsing using WORD or other +# programs which support those fields. +# Note: wordpad (write) and others do not support links. + +RTF_HYPERLINKS = NO + +# Load stylesheet definitions from file. Syntax is similar to doxygen's +# config file, i.e. a series of assignments. You only have to provide +# replacements, missing definitions are set to their default value. + +RTF_STYLESHEET_FILE = + +# Set optional variables used in the generation of an rtf document. +# Syntax is similar to doxygen's config file. + +RTF_EXTENSIONS_FILE = + +#--------------------------------------------------------------------------- +# configuration options related to the man page output +#--------------------------------------------------------------------------- + +# If the GENERATE_MAN tag is set to YES (the default) Doxygen will +# generate man pages + +GENERATE_MAN = NO + +# The MAN_OUTPUT tag is used to specify where the man pages will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `man' will be used as the default path. + +MAN_OUTPUT = man + +# The MAN_EXTENSION tag determines the extension that is added to +# the generated man pages (default is the subroutine's section .3) + +MAN_EXTENSION = .3 + +# If the MAN_LINKS tag is set to YES and Doxygen generates man output, +# then it will generate one additional man file for each entity +# documented in the real man page(s). These additional files +# only source the real man page, but without them the man command +# would be unable to find the correct page. The default is NO. + +MAN_LINKS = NO + +#--------------------------------------------------------------------------- +# configuration options related to the XML output +#--------------------------------------------------------------------------- + +# If the GENERATE_XML tag is set to YES Doxygen will +# generate an XML file that captures the structure of +# the code including all documentation. + +GENERATE_XML = NO + +# The XML_OUTPUT tag is used to specify where the XML pages will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `xml' will be used as the default path. + +XML_OUTPUT = xml + +# The XML_SCHEMA tag can be used to specify an XML schema, +# which can be used by a validating XML parser to check the +# syntax of the XML files. + +XML_SCHEMA = + +# The XML_DTD tag can be used to specify an XML DTD, +# which can be used by a validating XML parser to check the +# syntax of the XML files. + +XML_DTD = + +# If the XML_PROGRAMLISTING tag is set to YES Doxygen will +# dump the program listings (including syntax highlighting +# and cross-referencing information) to the XML output. Note that +# enabling this will significantly increase the size of the XML output. + +XML_PROGRAMLISTING = YES + +#--------------------------------------------------------------------------- +# configuration options for the AutoGen Definitions output +#--------------------------------------------------------------------------- + +# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will +# generate an AutoGen Definitions (see autogen.sf.net) file +# that captures the structure of the code including all +# documentation. Note that this feature is still experimental +# and incomplete at the moment. + +GENERATE_AUTOGEN_DEF = NO + +#--------------------------------------------------------------------------- +# configuration options related to the Perl module output +#--------------------------------------------------------------------------- + +# If the GENERATE_PERLMOD tag is set to YES Doxygen will +# generate a Perl module file that captures the structure of +# the code including all documentation. Note that this +# feature is still experimental and incomplete at the +# moment. + +GENERATE_PERLMOD = NO + +# If the PERLMOD_LATEX tag is set to YES Doxygen will generate +# the necessary Makefile rules, Perl scripts and LaTeX code to be able +# to generate PDF and DVI output from the Perl module output. + +PERLMOD_LATEX = NO + +# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be +# nicely formatted so it can be parsed by a human reader. This is useful +# if you want to understand what is going on. On the other hand, if this +# tag is set to NO the size of the Perl module output will be much smaller +# and Perl will parse it just the same. + +PERLMOD_PRETTY = YES + +# The names of the make variables in the generated doxyrules.make file +# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. +# This is useful so different doxyrules.make files included by the same +# Makefile don't overwrite each other's variables. + +PERLMOD_MAKEVAR_PREFIX = + +#--------------------------------------------------------------------------- +# Configuration options related to the preprocessor +#--------------------------------------------------------------------------- + +# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will +# evaluate all C-preprocessor directives found in the sources and include +# files. + +ENABLE_PREPROCESSING = YES + +# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro +# names in the source code. If set to NO (the default) only conditional +# compilation will be performed. Macro expansion can be done in a controlled +# way by setting EXPAND_ONLY_PREDEF to YES. + +MACRO_EXPANSION = NO + +# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES +# then the macro expansion is limited to the macros specified with the +# PREDEFINED and EXPAND_AS_DEFINED tags. + +EXPAND_ONLY_PREDEF = NO + +# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files +# in the INCLUDE_PATH (see below) will be search if a #include is found. + +SEARCH_INCLUDES = YES + +# The INCLUDE_PATH tag can be used to specify one or more directories that +# contain include files that are not input files but should be processed by +# the preprocessor. + +INCLUDE_PATH = + +# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard +# patterns (like *.h and *.hpp) to filter out the header-files in the +# directories. If left blank, the patterns specified with FILE_PATTERNS will +# be used. + +INCLUDE_FILE_PATTERNS = + +# The PREDEFINED tag can be used to specify one or more macro names that +# are defined before the preprocessor is started (similar to the -D option of +# gcc). The argument of the tag is a list of macros of the form: name +# or name=definition (no spaces). If the definition and the = are +# omitted =1 is assumed. To prevent a macro definition from being +# undefined via #undef or recursively expanded use the := operator +# instead of the = operator. + +PREDEFINED = + +# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then +# this tag can be used to specify a list of macro names that should be expanded. +# The macro definition that is found in the sources will be used. +# Use the PREDEFINED tag if you want to use a different macro definition. + +EXPAND_AS_DEFINED = + +# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then +# doxygen's preprocessor will remove all function-like macros that are alone +# on a line, have an all uppercase name, and do not end with a semicolon. Such +# function macros are typically used for boiler-plate code, and will confuse +# the parser if not removed. + +SKIP_FUNCTION_MACROS = YES + +#--------------------------------------------------------------------------- +# Configuration::additions related to external references +#--------------------------------------------------------------------------- + +# The TAGFILES option can be used to specify one or more tagfiles. +# Optionally an initial location of the external documentation +# can be added for each tagfile. The format of a tag file without +# this location is as follows: +# TAGFILES = file1 file2 ... +# Adding location for the tag files is done as follows: +# TAGFILES = file1=loc1 "file2 = loc2" ... +# where "loc1" and "loc2" can be relative or absolute paths or +# URLs. If a location is present for each tag, the installdox tool +# does not have to be run to correct the links. +# Note that each tag file must have a unique name +# (where the name does NOT include the path) +# If a tag file is not located in the directory in which doxygen +# is run, you must also specify the path to the tagfile here. + +TAGFILES = + +# When a file name is specified after GENERATE_TAGFILE, doxygen will create +# a tag file that is based on the input files it reads. + +GENERATE_TAGFILE = + +# If the ALLEXTERNALS tag is set to YES all external classes will be listed +# in the class index. If set to NO only the inherited external classes +# will be listed. + +ALLEXTERNALS = NO + +# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed +# in the modules index. If set to NO, only the current project's groups will +# be listed. + +EXTERNAL_GROUPS = YES + +# The PERL_PATH should be the absolute path and name of the perl script +# interpreter (i.e. the result of `which perl'). + +PERL_PATH = /usr/bin/perl + +#--------------------------------------------------------------------------- +# Configuration options related to the dot tool +#--------------------------------------------------------------------------- + +# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will +# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base +# or super classes. Setting the tag to NO turns the diagrams off. Note that +# this option is superseded by the HAVE_DOT option below. This is only a +# fallback. It is recommended to install and use dot, since it yields more +# powerful graphs. + +CLASS_DIAGRAMS = YES + +# You can define message sequence charts within doxygen comments using the \msc +# command. Doxygen will then run the mscgen tool (see +# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the +# documentation. The MSCGEN_PATH tag allows you to specify the directory where +# the mscgen tool resides. If left empty the tool is assumed to be found in the +# default search path. + +MSCGEN_PATH = + +# If set to YES, the inheritance and collaboration graphs will hide +# inheritance and usage relations if the target is undocumented +# or is not a class. + +HIDE_UNDOC_RELATIONS = YES + +# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is +# available from the path. This tool is part of Graphviz, a graph visualization +# toolkit from AT&T and Lucent Bell Labs. The other options in this section +# have no effect if this option is set to NO (the default) + +HAVE_DOT = NO + +# By default doxygen will write a font called FreeSans.ttf to the output +# directory and reference it in all dot files that doxygen generates. This +# font does not include all possible unicode characters however, so when you need +# these (or just want a differently looking font) you can specify the font name +# using DOT_FONTNAME. You need need to make sure dot is able to find the font, +# which can be done by putting it in a standard location or by setting the +# DOTFONTPATH environment variable or by setting DOT_FONTPATH to the directory +# containing the font. + +DOT_FONTNAME = FreeSans + +# By default doxygen will tell dot to use the output directory to look for the +# FreeSans.ttf font (which doxygen will put there itself). If you specify a +# different font using DOT_FONTNAME you can set the path where dot +# can find it using this tag. + +DOT_FONTPATH = + +# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen +# will generate a graph for each documented class showing the direct and +# indirect inheritance relations. Setting this tag to YES will force the +# the CLASS_DIAGRAMS tag to NO. + +CLASS_GRAPH = YES + +# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen +# will generate a graph for each documented class showing the direct and +# indirect implementation dependencies (inheritance, containment, and +# class references variables) of the class with other documented classes. + +COLLABORATION_GRAPH = YES + +# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen +# will generate a graph for groups, showing the direct groups dependencies + +GROUP_GRAPHS = YES + +# If the UML_LOOK tag is set to YES doxygen will generate inheritance and +# collaboration diagrams in a style similar to the OMG's Unified Modeling +# Language. + +UML_LOOK = YES + +# If set to YES, the inheritance and collaboration graphs will show the +# relations between templates and their instances. + +TEMPLATE_RELATIONS = NO + +# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT +# tags are set to YES then doxygen will generate a graph for each documented +# file showing the direct and indirect include dependencies of the file with +# other documented files. + +INCLUDE_GRAPH = YES + +# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and +# HAVE_DOT tags are set to YES then doxygen will generate a graph for each +# documented header file showing the documented files that directly or +# indirectly include this file. + +INCLUDED_BY_GRAPH = YES + +# If the CALL_GRAPH and HAVE_DOT options are set to YES then +# doxygen will generate a call dependency graph for every global function +# or class method. Note that enabling this option will significantly increase +# the time of a run. So in most cases it will be better to enable call graphs +# for selected functions only using the \callgraph command. + +CALL_GRAPH = NO + +# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then +# doxygen will generate a caller dependency graph for every global function +# or class method. Note that enabling this option will significantly increase +# the time of a run. So in most cases it will be better to enable caller +# graphs for selected functions only using the \callergraph command. + +CALLER_GRAPH = NO + +# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen +# will graphical hierarchy of all classes instead of a textual one. + +GRAPHICAL_HIERARCHY = YES + +# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES +# then doxygen will show the dependencies a directory has on other directories +# in a graphical way. The dependency relations are determined by the #include +# relations between the files in the directories. + +DIRECTORY_GRAPH = YES + +# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images +# generated by dot. Possible values are png, jpg, or gif +# If left blank png will be used. + +DOT_IMAGE_FORMAT = png + +# The tag DOT_PATH can be used to specify the path where the dot tool can be +# found. If left blank, it is assumed the dot tool can be found in the path. + +DOT_PATH = + +# The DOTFILE_DIRS tag can be used to specify one or more directories that +# contain dot files that are included in the documentation (see the +# \dotfile command). + +DOTFILE_DIRS = + +# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of +# nodes that will be shown in the graph. If the number of nodes in a graph +# becomes larger than this value, doxygen will truncate the graph, which is +# visualized by representing a node as a red box. Note that doxygen if the +# number of direct children of the root node in a graph is already larger than +# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note +# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH. + +DOT_GRAPH_MAX_NODES = 50 + +# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the +# graphs generated by dot. A depth value of 3 means that only nodes reachable +# from the root by following a path via at most 3 edges will be shown. Nodes +# that lay further from the root node will be omitted. Note that setting this +# option to 1 or 2 may greatly reduce the computation time needed for large +# code bases. Also note that the size of a graph can be further restricted by +# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction. + +MAX_DOT_GRAPH_DEPTH = 0 + +# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent +# background. This is enabled by default, which results in a transparent +# background. Warning: Depending on the platform used, enabling this option +# may lead to badly anti-aliased labels on the edges of a graph (i.e. they +# become hard to read). + +DOT_TRANSPARENT = YES + +# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output +# files in one run (i.e. multiple -o and -T options on the command line). This +# makes dot run faster, but since only newer versions of dot (>1.8.10) +# support this, this feature is disabled by default. + +DOT_MULTI_TARGETS = NO + +# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will +# generate a legend page explaining the meaning of the various boxes and +# arrows in the dot generated graphs. + +GENERATE_LEGEND = YES + +# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will +# remove the intermediate dot files that are used to generate +# the various graphs. + +DOT_CLEANUP = YES + +#--------------------------------------------------------------------------- +# Configuration::additions related to the search engine +#--------------------------------------------------------------------------- + +# The SEARCHENGINE tag specifies whether or not a search engine should be +# used. If set to NO the values of all tags below this one will be ignored. + +SEARCHENGINE = NO Added: trunk/doxygen/readme.txt =================================================================== --- trunk/doxygen/readme.txt (rev 0) +++ trunk/doxygen/readme.txt 2008-06-16 22:53:38 UTC (rev 1382) @@ -0,0 +1,12 @@ +For rendering your ol documentation install doxygen from + +http://www.stack.nl/~dimitri/doxygen/ + +You can start rendering in... [truncated message content] |
From: <re...@us...> - 2008-06-18 11:08:12
|
Revision: 1383 http://openlibraries.svn.sourceforge.net/openlibraries/?rev=1383&view=rev Author: rexbron Date: 2008-06-18 04:07:57 -0700 (Wed, 18 Jun 2008) Log 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... Modified Paths: -------------- trunk/FindGLEW.cmake trunk/src/openimagelib/il/CMakeLists.txt trunk/src/openimagelib/plugins/jpg/CMakeLists.txt trunk/src/openpluginlib/py/CMakeLists.txt Property Changed: ---------------- trunk/ Property changes on: trunk ___________________________________________________________________ Name: bzr:revision-info - timestamp: 2008-06-16 23:24:00.365999937 +0100 committer: Andrew Hunter <an...@ae...> properties: branch-nick: trunk + timestamp: 2008-06-18 12:03:15.190000057 +0100 committer: Andrew Hunter <an...@ae...> properties: branch-nick: trunk Name: bzr:ancestry:v3-trunk0 - an...@ae...-20080613162705-8emncakb7nkknsbj an...@ae...-20080614133032-vef9lmcgxyrauqss an...@ae...-20080614141409-u4z2pzco7bmhavlb an...@ae...-20080616112610-ky0ylmbwjn9w1mzm an...@ae...-20080616122604-vyn3c4elr33ehlai an...@ae...-20080616222235-pb4vb2oeu6cj88m4 + an...@ae...-20080613162705-8emncakb7nkknsbj an...@ae...-20080614133032-vef9lmcgxyrauqss an...@ae...-20080614141409-u4z2pzco7bmhavlb an...@ae...-20080616112610-ky0ylmbwjn9w1mzm an...@ae...-20080616122604-vyn3c4elr33ehlai an...@ae...-20080616222235-pb4vb2oeu6cj88m4 an...@ae...-20080618110236-pfuxsos8x3wd285v Name: bzr:file-ids - FindOpenEXR.cmake findopenexr.cmake-20080616221215-17ge0xzpvuxlhnjz-1 src/openimagelib/plugins/jpg/CMakeLists.txt cmakelists.txt-20080616215536-2e4278apyb0elsd6-1 + Name: bzr:revision-id:v3-trunk0 - 1373 an...@ae...-20080614130206-thshu8ln95djpgng 1374 an...@ae...-20080616113201-cexl9qhreccah10e 1375 an...@ae...-20080616113418-7qu4qxldvpxfrdp7 1376 an...@ae...-20080616113559-u5wad4bpwd9uzmd8 1377 an...@ae...-20080616122853-cwqokea7hkf82eo1 1378 an...@ae...-20080616222400-9q0vwtkk6091txce + 1373 an...@ae...-20080614130206-thshu8ln95djpgng 1374 an...@ae...-20080616113201-cexl9qhreccah10e 1375 an...@ae...-20080616113418-7qu4qxldvpxfrdp7 1376 an...@ae...-20080616113559-u5wad4bpwd9uzmd8 1377 an...@ae...-20080616122853-cwqokea7hkf82eo1 1378 an...@ae...-20080616222400-9q0vwtkk6091txce 1380 an...@ae...-20080618110315-ngg1d48fy0h3b6bs Modified: trunk/FindGLEW.cmake =================================================================== --- trunk/FindGLEW.cmake 2008-06-16 22:53:38 UTC (rev 1382) +++ trunk/FindGLEW.cmake 2008-06-18 11:07:57 UTC (rev 1383) @@ -26,8 +26,9 @@ NAMES ${GLEW_NAMES} PATHS c:/glew/lib ${COMPILER_PATH}/PlatformSDK/Lib ) else( WIN32 ) - FIND_PATH( GLEW_INCLUDE_DIR GL/glew.h GL/wglew.h gl/glew.h gl/wglew.h - PATHS /usr/local/include /usr/include ) + FIND_PATH( GLEW_INCLUDE_DIR glew.h wglew.h + PATHS /usr/local/include /usr/include + PATH_SUFFIXES gl/ GL/ ) SET( GLEW_NAMES glew GLEW ) FIND_LIBRARY( GLEW_LIBRARY NAMES ${GLEW_NAMES} Modified: trunk/src/openimagelib/il/CMakeLists.txt =================================================================== --- trunk/src/openimagelib/il/CMakeLists.txt 2008-06-16 22:53:38 UTC (rev 1382) +++ trunk/src/openimagelib/il/CMakeLists.txt 2008-06-18 11:07:57 UTC (rev 1383) @@ -47,3 +47,4 @@ # required links link_directories( ${OpenLibraries_BINARY_DIR}/src/openpluginlib/pl ) target_link_libraries( ${NAME} "openpluginlib_pl${LIBRARY_IDENTIFIER}" ) +set_target_properties( ${NAME} PROPERTIES VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH} SOVERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH} ) Modified: trunk/src/openimagelib/plugins/jpg/CMakeLists.txt =================================================================== --- trunk/src/openimagelib/plugins/jpg/CMakeLists.txt 2008-06-16 22:53:38 UTC (rev 1382) +++ trunk/src/openimagelib/plugins/jpg/CMakeLists.txt 2008-06-18 11:07:57 UTC (rev 1383) @@ -9,9 +9,10 @@ SET ( SOURCES jpg_plugin.cpp ) ADD_LIBRARY ( ${NAME} SHARED ${SOURCES} ) INCLUDE_DIRECTORIES ( ${JPEG_INCLUDE_DIR} ) - LINK_DIRECTORIES ( ${JPEG_LIBRAIES} ) + LINK_DIRECTORIES ( ${JPEG_LIBRAIES} ${OpenLibraries_BINARY_DIR}/src/openpluginlib/pl ${OpenLibraries_BINARY_DIR}/src/openimagelib/il/) + TARGET_LINK_LIBRARIES ( ${NAME} ${JPEG_LIBRAIES} "openpluginlib_pl${LIBRARY_IDENTIFIER}" "openimagelib_il${LIBRARY_IDENTIFIER}" ) INSTALL ( FILES jpg_plugins.opl DESTINATION "lib/${PACKAGE}/openimagelib/plugins/" ) - INCLUDE ( TARGETS ${NAME} DESTINATION "lib/${PACKAGE}/openimagelib/plugins" ) + INSTALL( TARGETS ${NAME} DESTINATION "lib/${PACKAGE}/openimagelib/plugins" ) ELSE ( JPEG_FOUND ) - MESSAGE ( "libJPEG not found, skipping jpg plugin." + MESSAGE ( "libJPEG not found, skipping jpg plugin." ) ENDIF ( JPEG_FOUND ) Modified: trunk/src/openpluginlib/py/CMakeLists.txt =================================================================== --- trunk/src/openpluginlib/py/CMakeLists.txt 2008-06-16 22:53:38 UTC (rev 1382) +++ trunk/src/openpluginlib/py/CMakeLists.txt 2008-06-18 11:07:57 UTC (rev 1383) @@ -25,6 +25,18 @@ MESSAGE ( "Found Python: ${PYTHON_INCLUDE_PATH} ${PYTHON_LIBRARIES} " ) INCLUDE_DIRECTORIES ( ${PYTHON_INCLUDE_PATH} ) -TARGET_LINK_LIBRARIES ( ${NAME} ${PYTHON_LIBRARIES} ) +TARGET_LINK_LIBRARIES ( ${NAME} ${PYTHON_LIBRARIES} + ${Boost_LIBRARY_DIRS}/libboost_filesystem.so + ${Boost_LIBRARY_DIRS}/libboost_python.so + ${Boost_LIBRARY_DIRS}/libboost_regex.so + ${Boost_LIBRARY_DIRS}/libboost_thread.so + ${XML2_LIBRARIES} + ${OpenLibraries_BINARY_DIR}/src/openpluginlib/pl/libopenpluginlib_pl.so ) +IF ( GLEW_FOUND ) + TARGET_LINK_LIBRARIES ( ${NAME} ${GLEW_LIBRARY} ) +ENDIF ( GLEW_FOUND ) + +SET_TARGET_PROPERTIES ( ${NAME} PROPERTIES VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH} SOVERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH} ) + INSTALL ( TARGETS ${NAME} LIBRARY DESTINATION "lib/${PACKAGE}/openpluginlib/py/" ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <re...@us...> - 2008-06-18 11:41:19
|
Revision: 1384 http://openlibraries.svn.sourceforge.net/openlibraries/?rev=1384&view=rev Author: rexbron Date: 2008-06-18 04:41:15 -0700 (Wed, 18 Jun 2008) Log Message: ----------- * Upped the minimum cmake version to 2.6 to use better FindBoost.cmake. Modified Paths: -------------- trunk/CMakeLists.txt trunk/src/openpluginlib/py/CMakeLists.txt Property Changed: ---------------- trunk/ Property changes on: trunk ___________________________________________________________________ Name: bzr:revision-info - timestamp: 2008-06-18 12:03:15.190000057 +0100 committer: Andrew Hunter <an...@ae...> properties: branch-nick: trunk + timestamp: 2008-06-18 12:40:01.454999924 +0100 committer: Andrew Hunter <an...@ae...> properties: branch-nick: trunk Name: bzr:ancestry:v3-trunk0 - an...@ae...-20080613162705-8emncakb7nkknsbj an...@ae...-20080614133032-vef9lmcgxyrauqss an...@ae...-20080614141409-u4z2pzco7bmhavlb an...@ae...-20080616112610-ky0ylmbwjn9w1mzm an...@ae...-20080616122604-vyn3c4elr33ehlai an...@ae...-20080616222235-pb4vb2oeu6cj88m4 an...@ae...-20080618110236-pfuxsos8x3wd285v + an...@ae...-20080613162705-8emncakb7nkknsbj an...@ae...-20080614133032-vef9lmcgxyrauqss an...@ae...-20080614141409-u4z2pzco7bmhavlb an...@ae...-20080616112610-ky0ylmbwjn9w1mzm an...@ae...-20080616122604-vyn3c4elr33ehlai an...@ae...-20080616222235-pb4vb2oeu6cj88m4 an...@ae...-20080618110236-pfuxsos8x3wd285v an...@ae...-20080618113925-cjg8er4jn4tmc0dm Name: bzr:revision-id:v3-trunk0 - 1373 an...@ae...-20080614130206-thshu8ln95djpgng 1374 an...@ae...-20080616113201-cexl9qhreccah10e 1375 an...@ae...-20080616113418-7qu4qxldvpxfrdp7 1376 an...@ae...-20080616113559-u5wad4bpwd9uzmd8 1377 an...@ae...-20080616122853-cwqokea7hkf82eo1 1378 an...@ae...-20080616222400-9q0vwtkk6091txce 1380 an...@ae...-20080618110315-ngg1d48fy0h3b6bs + 1373 an...@ae...-20080614130206-thshu8ln95djpgng 1374 an...@ae...-20080616113201-cexl9qhreccah10e 1375 an...@ae...-20080616113418-7qu4qxldvpxfrdp7 1376 an...@ae...-20080616113559-u5wad4bpwd9uzmd8 1377 an...@ae...-20080616122853-cwqokea7hkf82eo1 1378 an...@ae...-20080616222400-9q0vwtkk6091txce 1380 an...@ae...-20080618110315-ngg1d48fy0h3b6bs 1381 an...@ae...-20080618114001-2574od4etx4v8p9h Modified: trunk/CMakeLists.txt =================================================================== --- trunk/CMakeLists.txt 2008-06-18 11:07:57 UTC (rev 1383) +++ trunk/CMakeLists.txt 2008-06-18 11:41:15 UTC (rev 1384) @@ -1,3 +1,5 @@ +cmake_minimum_required ( VERSION 2.6 ) + project( OpenLibraries ) set( VERSION_MAJOR 0 ) @@ -22,7 +24,7 @@ set( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR} ) # boost -find_package( Boost REQUIRED ) +find_package( Boost COMPONENTS filesystem python regex thread REQUIRED ) if ( Boost_FOUND ) message( "found boost: ${Boost_INCLUDE_DIR}" ) include_directories( ${Boost_INCLUDE_DIR} ) Modified: trunk/src/openpluginlib/py/CMakeLists.txt =================================================================== --- trunk/src/openpluginlib/py/CMakeLists.txt 2008-06-18 11:07:57 UTC (rev 1383) +++ trunk/src/openpluginlib/py/CMakeLists.txt 2008-06-18 11:41:15 UTC (rev 1384) @@ -26,10 +26,7 @@ MESSAGE ( "Found Python: ${PYTHON_INCLUDE_PATH} ${PYTHON_LIBRARIES} " ) INCLUDE_DIRECTORIES ( ${PYTHON_INCLUDE_PATH} ) TARGET_LINK_LIBRARIES ( ${NAME} ${PYTHON_LIBRARIES} - ${Boost_LIBRARY_DIRS}/libboost_filesystem.so - ${Boost_LIBRARY_DIRS}/libboost_python.so - ${Boost_LIBRARY_DIRS}/libboost_regex.so - ${Boost_LIBRARY_DIRS}/libboost_thread.so + ${Boost_LIBRARIES} ${XML2_LIBRARIES} ${OpenLibraries_BINARY_DIR}/src/openpluginlib/pl/libopenpluginlib_pl.so ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <re...@us...> - 2008-06-18 20:04:13
|
Revision: 1385 http://openlibraries.svn.sourceforge.net/openlibraries/?rev=1385&view=rev Author: rexbron Date: 2008-06-18 13:03:16 -0700 (Wed, 18 Jun 2008) Log Message: ----------- Link avformat_plugin and oml python extention correctly. Modified Paths: -------------- trunk/src/openmedialib/plugins/avformat/CMakeLists.txt trunk/src/openmedialib/py/CMakeLists.txt Property Changed: ---------------- trunk/ Property changes on: trunk ___________________________________________________________________ Name: bzr:revision-info - timestamp: 2008-06-18 12:40:01.454999924 +0100 committer: Andrew Hunter <an...@ae...> properties: branch-nick: trunk + timestamp: 2008-06-18 21:02:08.308000088 +0100 committer: Andrew Hunter <an...@ae...> properties: branch-nick: trunk Name: bzr:ancestry:v3-trunk0 - an...@ae...-20080613162705-8emncakb7nkknsbj an...@ae...-20080614133032-vef9lmcgxyrauqss an...@ae...-20080614141409-u4z2pzco7bmhavlb an...@ae...-20080616112610-ky0ylmbwjn9w1mzm an...@ae...-20080616122604-vyn3c4elr33ehlai an...@ae...-20080616222235-pb4vb2oeu6cj88m4 an...@ae...-20080618110236-pfuxsos8x3wd285v an...@ae...-20080618113925-cjg8er4jn4tmc0dm + an...@ae...-20080613162705-8emncakb7nkknsbj an...@ae...-20080614133032-vef9lmcgxyrauqss an...@ae...-20080614141409-u4z2pzco7bmhavlb an...@ae...-20080616112610-ky0ylmbwjn9w1mzm an...@ae...-20080616122604-vyn3c4elr33ehlai an...@ae...-20080616222235-pb4vb2oeu6cj88m4 an...@ae...-20080618110236-pfuxsos8x3wd285v an...@ae...-20080618113925-cjg8er4jn4tmc0dm an...@ae...-20080618182841-z2to60sr79wfdq9o Name: bzr:revision-id:v3-trunk0 - 1373 an...@ae...-20080614130206-thshu8ln95djpgng 1374 an...@ae...-20080616113201-cexl9qhreccah10e 1375 an...@ae...-20080616113418-7qu4qxldvpxfrdp7 1376 an...@ae...-20080616113559-u5wad4bpwd9uzmd8 1377 an...@ae...-20080616122853-cwqokea7hkf82eo1 1378 an...@ae...-20080616222400-9q0vwtkk6091txce 1380 an...@ae...-20080618110315-ngg1d48fy0h3b6bs 1381 an...@ae...-20080618114001-2574od4etx4v8p9h + 1373 an...@ae...-20080614130206-thshu8ln95djpgng 1374 an...@ae...-20080616113201-cexl9qhreccah10e 1375 an...@ae...-20080616113418-7qu4qxldvpxfrdp7 1376 an...@ae...-20080616113559-u5wad4bpwd9uzmd8 1377 an...@ae...-20080616122853-cwqokea7hkf82eo1 1378 an...@ae...-20080616222400-9q0vwtkk6091txce 1380 an...@ae...-20080618110315-ngg1d48fy0h3b6bs 1381 an...@ae...-20080618114001-2574od4etx4v8p9h 1382 an...@ae...-20080618200208-ysmuaq2p7bfh7km4 Modified: trunk/src/openmedialib/plugins/avformat/CMakeLists.txt =================================================================== --- trunk/src/openmedialib/plugins/avformat/CMakeLists.txt 2008-06-18 11:41:15 UTC (rev 1384) +++ trunk/src/openmedialib/plugins/avformat/CMakeLists.txt 2008-06-18 20:03:16 UTC (rev 1385) @@ -23,7 +23,7 @@ RUNTIME DESTINATION "lib/${PACKAGE}/openmedialib/plugins" LIBRARY DESTINATION "lib/${PACKAGE}/openmedialib/plugins" ) -find_package( FFMPEG ) +find_package( FFMPEG REQUIRED ) if( FFMPEG_FOUND ) message( "found FFMPEG: ${FFMPEG_INCLUDE_DIR} ${FFMPEG_LIBRARY_DIR}" ) include_directories( ${FFMPEG_INCLUDE_DIR} ) @@ -39,6 +39,7 @@ link_directories( ${OpenLibraries_BINARY_DIR}/src/openpluginlib/pl ${OpenLibraries_BINARY_DIR}/src/openimagelib/il ${openmedialib_ml_BINARY_DIR} ) -target_link_libraries( ${NAME} "openpluginlib_pl${LIBRARY_IDENTIFIER}" ) -target_link_libraries( ${NAME} "openimagelib_il${LIBRARY_IDENTIFIER}" ) -target_link_libraries( ${NAME} "openmedialib_ml${LIBRARY_IDENTIFIER}" ) +target_link_libraries( ${NAME} "openpluginlib_pl${LIBRARY_IDENTIFIER}" + "openimagelib_il${LIBRARY_IDENTIFIER}" + "openmedialib_ml${LIBRARY_IDENTIFIER}" + ${Boost_FILESYSTEM_LIBRARY} ) Modified: trunk/src/openmedialib/py/CMakeLists.txt =================================================================== --- trunk/src/openmedialib/py/CMakeLists.txt 2008-06-18 11:41:15 UTC (rev 1384) +++ trunk/src/openmedialib/py/CMakeLists.txt 2008-06-18 20:03:16 UTC (rev 1385) @@ -15,6 +15,13 @@ MESSAGE ( "Found Python: ${PYTHON_INCLUDE_PATH} ${PYTHON_LIBRARIES} " ) INCLUDE_DIRECTORIES ( ${PYTHON_INCLUDE_PATH} ) -TARGET_LINK_LIBRARIES ( ${NAME} ${PYTHON_LIBRARIES} ) +link_directories( ${OpenLibraries_BINARY_DIR}/src/openpluginlib/pl + ${openmedialib_ml_BINARY_DIR} ) +TARGET_LINK_LIBRARIES ( ${NAME} ${PYTHON_LIBRARIES} + ${Boost_PYTHON_LIBRARY} + "openpluginlib_pl${LIBRARY_IDENTIFIER}" + "openmedialib_ml${LIBRARY_IDENTFIER}" ) +SET_TARGET_PROPERTIES ( ${NAME} PROPERTIES VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH} SOVERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH} ) + INSTALL ( TARGETS ${NAME} LIBRARY DESTINATION "lib/${PACKAGE}/openmedialib/py/" ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <re...@us...> - 2008-06-18 20:08:52
|
Revision: 1386 http://openlibraries.svn.sourceforge.net/openlibraries/?rev=1386&view=rev Author: rexbron Date: 2008-06-18 13:07:04 -0700 (Wed, 18 Jun 2008) Log Message: ----------- Link gensys and glew plugins against correct libs. Modified Paths: -------------- trunk/src/openmedialib/plugins/gensys/CMakeLists.txt trunk/src/openmedialib/plugins/glew/CMakeLists.txt Property Changed: ---------------- trunk/ Property changes on: trunk ___________________________________________________________________ Name: bzr:revision-info - timestamp: 2008-06-18 21:02:08.308000088 +0100 committer: Andrew Hunter <an...@ae...> properties: branch-nick: trunk + timestamp: 2008-06-18 21:06:23.986000061 +0100 committer: Andrew Hunter <an...@ae...> properties: branch-nick: trunk Name: bzr:ancestry:v3-trunk0 - an...@ae...-20080613162705-8emncakb7nkknsbj an...@ae...-20080614133032-vef9lmcgxyrauqss an...@ae...-20080614141409-u4z2pzco7bmhavlb an...@ae...-20080616112610-ky0ylmbwjn9w1mzm an...@ae...-20080616122604-vyn3c4elr33ehlai an...@ae...-20080616222235-pb4vb2oeu6cj88m4 an...@ae...-20080618110236-pfuxsos8x3wd285v an...@ae...-20080618113925-cjg8er4jn4tmc0dm an...@ae...-20080618182841-z2to60sr79wfdq9o + an...@ae...-20080613162705-8emncakb7nkknsbj an...@ae...-20080614133032-vef9lmcgxyrauqss an...@ae...-20080614141409-u4z2pzco7bmhavlb an...@ae...-20080616112610-ky0ylmbwjn9w1mzm an...@ae...-20080616122604-vyn3c4elr33ehlai an...@ae...-20080616222235-pb4vb2oeu6cj88m4 an...@ae...-20080618110236-pfuxsos8x3wd285v an...@ae...-20080618113925-cjg8er4jn4tmc0dm an...@ae...-20080618182841-z2to60sr79wfdq9o an...@ae...-20080618190025-f4tqmfnhagk3glij Name: bzr:revision-id:v3-trunk0 - 1373 an...@ae...-20080614130206-thshu8ln95djpgng 1374 an...@ae...-20080616113201-cexl9qhreccah10e 1375 an...@ae...-20080616113418-7qu4qxldvpxfrdp7 1376 an...@ae...-20080616113559-u5wad4bpwd9uzmd8 1377 an...@ae...-20080616122853-cwqokea7hkf82eo1 1378 an...@ae...-20080616222400-9q0vwtkk6091txce 1380 an...@ae...-20080618110315-ngg1d48fy0h3b6bs 1381 an...@ae...-20080618114001-2574od4etx4v8p9h 1382 an...@ae...-20080618200208-ysmuaq2p7bfh7km4 + 1373 an...@ae...-20080614130206-thshu8ln95djpgng 1374 an...@ae...-20080616113201-cexl9qhreccah10e 1375 an...@ae...-20080616113418-7qu4qxldvpxfrdp7 1376 an...@ae...-20080616113559-u5wad4bpwd9uzmd8 1377 an...@ae...-20080616122853-cwqokea7hkf82eo1 1378 an...@ae...-20080616222400-9q0vwtkk6091txce 1380 an...@ae...-20080618110315-ngg1d48fy0h3b6bs 1381 an...@ae...-20080618114001-2574od4etx4v8p9h 1382 an...@ae...-20080618200208-ysmuaq2p7bfh7km4 1383 an...@ae...-20080618200623-29djr6bh81pmu2mu Modified: trunk/src/openmedialib/plugins/gensys/CMakeLists.txt =================================================================== --- trunk/src/openmedialib/plugins/gensys/CMakeLists.txt 2008-06-18 20:03:16 UTC (rev 1385) +++ trunk/src/openmedialib/plugins/gensys/CMakeLists.txt 2008-06-18 20:07:04 UTC (rev 1386) @@ -27,6 +27,7 @@ link_directories( ${OpenLibraries_BINARY_DIR}/src/openpluginlib/pl ${OpenLibraries_BINARY_DIR}/src/openimagelib/il ${openmedialib_ml_BINARY_DIR} ) -target_link_libraries( ${NAME} "openpluginlib_pl${LIBRARY_IDENTIFIER}" ) -target_link_libraries( ${NAME} "openimagelib_il${LIBRARY_IDENTIFIER}" ) -target_link_libraries( ${NAME} "openmedialib_ml${LIBRARY_IDENTIFIER}" ) +target_link_libraries( ${NAME} "openpluginlib_pl${LIBRARY_IDENTIFIER}" + "openimagelib_il${LIBRARY_IDENTIFIER}" + "openmedialib_ml${LIBRARY_IDENTIFIER}" + ${Boost_FILESYSTEM_LIBRARY} ) Modified: trunk/src/openmedialib/plugins/glew/CMakeLists.txt =================================================================== --- trunk/src/openmedialib/plugins/glew/CMakeLists.txt 2008-06-18 20:03:16 UTC (rev 1385) +++ trunk/src/openmedialib/plugins/glew/CMakeLists.txt 2008-06-18 20:07:04 UTC (rev 1386) @@ -52,8 +52,9 @@ link_directories( ${OpenLibraries_BINARY_DIR}/src/openpluginlib/pl ${OpenLibraries_BINARY_DIR}/src/openimagelib/il ${openmedialib_ml_BINARY_DIR} ) -target_link_libraries( ${NAME} "openpluginlib_pl${LIBRARY_IDENTIFIER}" ) -target_link_libraries( ${NAME} "openimagelib_il${LIBRARY_IDENTIFIER}" ) -target_link_libraries( ${NAME} "openmedialib_ml${LIBRARY_IDENTIFIER}" ) -target_link_libraries( ${NAME} ${GLEW_LIBRARY} ) -target_link_libraries( ${NAME} ${GLUT_LIBRARY} ) +target_link_libraries( ${NAME} "openpluginlib_pl${LIBRARY_IDENTIFIER}" + "openimagelib_il${LIBRARY_IDENTIFIER}" + "openmedialib_ml${LIBRARY_IDENTIFIER}" + ${GLEW_LIBRARY} + ${GLUT_LIBRARY} + ${Boost_FILESYSTEM_LIBRARY} ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <re...@us...> - 2008-06-18 20:12:55
|
Revision: 1387 http://openlibraries.svn.sourceforge.net/openlibraries/?rev=1387&view=rev Author: rexbron Date: 2008-06-18 13:11:44 -0700 (Wed, 18 Jun 2008) Log Message: ----------- Initial work on ofx plugin cmake files. Modified Paths: -------------- trunk/FindOPENFX.cmake trunk/src/openmedialib/plugins/CMakeLists.txt Added Paths: ----------- trunk/src/openmedialib/plugins/ofx/CMakeLists.txt Property Changed: ---------------- trunk/ Property changes on: trunk ___________________________________________________________________ Name: bzr:revision-info - timestamp: 2008-06-18 21:06:23.986000061 +0100 committer: Andrew Hunter <an...@ae...> properties: branch-nick: trunk + timestamp: 2008-06-18 21:11:05.530999899 +0100 committer: Andrew Hunter <an...@ae...> properties: branch-nick: trunk Name: bzr:ancestry:v3-trunk0 - an...@ae...-20080613162705-8emncakb7nkknsbj an...@ae...-20080614133032-vef9lmcgxyrauqss an...@ae...-20080614141409-u4z2pzco7bmhavlb an...@ae...-20080616112610-ky0ylmbwjn9w1mzm an...@ae...-20080616122604-vyn3c4elr33ehlai an...@ae...-20080616222235-pb4vb2oeu6cj88m4 an...@ae...-20080618110236-pfuxsos8x3wd285v an...@ae...-20080618113925-cjg8er4jn4tmc0dm an...@ae...-20080618182841-z2to60sr79wfdq9o an...@ae...-20080618190025-f4tqmfnhagk3glij + an...@ae...-20080613162705-8emncakb7nkknsbj an...@ae...-20080614133032-vef9lmcgxyrauqss an...@ae...-20080614141409-u4z2pzco7bmhavlb an...@ae...-20080616112610-ky0ylmbwjn9w1mzm an...@ae...-20080616122604-vyn3c4elr33ehlai an...@ae...-20080616222235-pb4vb2oeu6cj88m4 an...@ae...-20080618110236-pfuxsos8x3wd285v an...@ae...-20080618113925-cjg8er4jn4tmc0dm an...@ae...-20080618182841-z2to60sr79wfdq9o an...@ae...-20080618190025-f4tqmfnhagk3glij an...@ae...-20080618195823-74quloizraz2fwj2 Name: bzr:file-ids - + src/openmedialib/plugins/ofx/CMakeLists.txt cmakelists.txt-20080618195718-n53mf989huhz0bvq-1 Name: bzr:revision-id:v3-trunk0 - 1373 an...@ae...-20080614130206-thshu8ln95djpgng 1374 an...@ae...-20080616113201-cexl9qhreccah10e 1375 an...@ae...-20080616113418-7qu4qxldvpxfrdp7 1376 an...@ae...-20080616113559-u5wad4bpwd9uzmd8 1377 an...@ae...-20080616122853-cwqokea7hkf82eo1 1378 an...@ae...-20080616222400-9q0vwtkk6091txce 1380 an...@ae...-20080618110315-ngg1d48fy0h3b6bs 1381 an...@ae...-20080618114001-2574od4etx4v8p9h 1382 an...@ae...-20080618200208-ysmuaq2p7bfh7km4 1383 an...@ae...-20080618200623-29djr6bh81pmu2mu + 1373 an...@ae...-20080614130206-thshu8ln95djpgng 1374 an...@ae...-20080616113201-cexl9qhreccah10e 1375 an...@ae...-20080616113418-7qu4qxldvpxfrdp7 1376 an...@ae...-20080616113559-u5wad4bpwd9uzmd8 1377 an...@ae...-20080616122853-cwqokea7hkf82eo1 1378 an...@ae...-20080616222400-9q0vwtkk6091txce 1380 an...@ae...-20080618110315-ngg1d48fy0h3b6bs 1381 an...@ae...-20080618114001-2574od4etx4v8p9h 1382 an...@ae...-20080618200208-ysmuaq2p7bfh7km4 1383 an...@ae...-20080618200623-29djr6bh81pmu2mu 1384 an...@ae...-20080618201105-neebgl19i1lbskta Modified: trunk/FindOPENFX.cmake =================================================================== --- trunk/FindOPENFX.cmake 2008-06-18 20:07:04 UTC (rev 1386) +++ trunk/FindOPENFX.cmake 2008-06-18 20:11:44 UTC (rev 1387) @@ -1,7 +1,7 @@ # FindOPENFX.cmake # # OPENFX_FOUND -# OPENFX_INCLUDE_PATH +# OPENFX_INCLUDE_DIR IF ( WIN32 ) #Add commands to find libofx on win32 @@ -9,7 +9,7 @@ IF ( APPLE ) #Add commands to find libofx on OS X ELSE ( APPLE ) - FIND_PATH( OPENFX_INCLUDE_PATH ofxTimeLine.h + FIND_PATH( OPENFX_INCLUDE_DIR ofxTimeLine.h PATHS /usr/include/ /usr/local/include/ PATH_SUFFIXES libopenfx @@ -19,8 +19,8 @@ SET ( OPENFX_FOUND FALSE ) -IF ( OPENFX_INCLUDE_PATH ) +IF ( OPENFX_INCLUDE_DIR ) SET ( OPENFX_FOUND TRUE ) -ENDIF ( OPENFX_INCLUDE_PATH ) +ENDIF ( OPENFX_INCLUDE_DIR ) -MARK_AS_ADVANCED ( OPENFX_INCLUDE_PATH ) +MARK_AS_ADVANCED ( OPENFX_INCLUDE_DIR ) Modified: trunk/src/openmedialib/plugins/CMakeLists.txt =================================================================== --- trunk/src/openmedialib/plugins/CMakeLists.txt 2008-06-18 20:07:04 UTC (rev 1386) +++ trunk/src/openmedialib/plugins/CMakeLists.txt 2008-06-18 20:11:44 UTC (rev 1387) @@ -2,7 +2,9 @@ add_subdirectory( glew ) add_subdirectory( avformat ) add_subdirectory( gensys ) -#add_subdirectory( ofx ) +if ( WITH_OFX_PLUGIN ) + add_subdirectory( ofx ) +endif ( WITH_OFX_PLUGIN ) add_subdirectory( openal ) add_subdirectory( sdl ) Added: trunk/src/openmedialib/plugins/ofx/CMakeLists.txt =================================================================== --- trunk/src/openmedialib/plugins/ofx/CMakeLists.txt (rev 0) +++ trunk/src/openmedialib/plugins/ofx/CMakeLists.txt 2008-06-18 20:11:44 UTC (rev 1387) @@ -0,0 +1,30 @@ +find_package ( OPENFX ) + +include_directories( ${OpenLibraries_SOURCE_DIR}/src ) + +set ( NAME "openmedialib_ofx" ) + +if( WIN32 ) + add_definitions( -DML_PLUGIN_EXPORTS ) + set( NAME "${NAME}${LIBRARY_IDENTIFIER}" ) +endif( WIN32 ) + + +if ( OPENFX_FOUND ) + include_directories ( ${OPENFX_INCLUDE_DIR} ) + set ( SOURCES ofx_plugin.cpp ) + add_library ( ${NAME} SHARED ${SOURCES} ) + link_directories( ${OpenLibraries_BINARY_DIR}/src/openpluginlib/pl + ${OpenLibraries_BINARY_DIR}/src/openimagelib/il + ${openmedialib_ml_BINARY_DIR} ) + target_link_libraries( ${NAME} "openpluginlib_pl${LIBRARY_IDENTIFIER}" + "openimagelib_il${LIBRARY_IDENTIFIER}" + "openmedialib_ml${LIBRARY_IDENTIFIER}" + ${Boost_FILESYSTEM_LIBRARY} ) + install ( TARGETS ${NAME} + RUNTIME DESTINATION "lib/${PACKAGE}/openmedialib/plugins" + LIBRARY DESTINATION "lib/${PACKAGE}/openpluginlib/plugins" ) + install ( FILES ofx_plugin.opl DESTINATION "lib/${PACKAGE}/openmedialib/plugins" ) +else ( OPENFX_FOUND ) + message ( "libopenfx not found. Skipping libopenfx plugin." ) +endif ( OPENFX_FOUND ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <re...@us...> - 2008-06-19 12:27:07
|
Revision: 1389 http://openlibraries.svn.sourceforge.net/openlibraries/?rev=1389&view=rev Author: rexbron Date: 2008-06-19 05:27:04 -0700 (Thu, 19 Jun 2008) Log Message: ----------- Link oml and opl python extentions in a cross-platform friendly way. Modified Paths: -------------- trunk/src/openimagelib/py/CMakeLists.txt trunk/src/openpluginlib/py/CMakeLists.txt Property Changed: ---------------- trunk/ Property changes on: trunk ___________________________________________________________________ Name: bzr:revision-info - timestamp: 2008-06-18 21:11:05.530999899 +0100 committer: Andrew Hunter <an...@ae...> properties: branch-nick: trunk + timestamp: 2008-06-19 13:26:46.507999897 +0100 committer: Andrew Hunter <an...@ae...> properties: branch-nick: trunk Name: bzr:ancestry:v3-trunk0 - an...@ae...-20080613162705-8emncakb7nkknsbj an...@ae...-20080614133032-vef9lmcgxyrauqss an...@ae...-20080614141409-u4z2pzco7bmhavlb an...@ae...-20080616112610-ky0ylmbwjn9w1mzm an...@ae...-20080616122604-vyn3c4elr33ehlai an...@ae...-20080616222235-pb4vb2oeu6cj88m4 an...@ae...-20080618110236-pfuxsos8x3wd285v an...@ae...-20080618113925-cjg8er4jn4tmc0dm an...@ae...-20080618182841-z2to60sr79wfdq9o an...@ae...-20080618190025-f4tqmfnhagk3glij an...@ae...-20080618195823-74quloizraz2fwj2 + an...@ae...-20080613162705-8emncakb7nkknsbj an...@ae...-20080614133032-vef9lmcgxyrauqss an...@ae...-20080614141409-u4z2pzco7bmhavlb an...@ae...-20080616112610-ky0ylmbwjn9w1mzm an...@ae...-20080616122604-vyn3c4elr33ehlai an...@ae...-20080616222235-pb4vb2oeu6cj88m4 an...@ae...-20080618110236-pfuxsos8x3wd285v an...@ae...-20080618113925-cjg8er4jn4tmc0dm an...@ae...-20080618182841-z2to60sr79wfdq9o an...@ae...-20080618190025-f4tqmfnhagk3glij an...@ae...-20080618195823-74quloizraz2fwj2 an...@ae...-20080619122406-jnh8jzrryfz26k5d Name: bzr:file-ids - src/openmedialib/plugins/ofx/CMakeLists.txt cmakelists.txt-20080618195718-n53mf989huhz0bvq-1 + Name: bzr:revision-id:v3-trunk0 - 1373 an...@ae...-20080614130206-thshu8ln95djpgng 1374 an...@ae...-20080616113201-cexl9qhreccah10e 1375 an...@ae...-20080616113418-7qu4qxldvpxfrdp7 1376 an...@ae...-20080616113559-u5wad4bpwd9uzmd8 1377 an...@ae...-20080616122853-cwqokea7hkf82eo1 1378 an...@ae...-20080616222400-9q0vwtkk6091txce 1380 an...@ae...-20080618110315-ngg1d48fy0h3b6bs 1381 an...@ae...-20080618114001-2574od4etx4v8p9h 1382 an...@ae...-20080618200208-ysmuaq2p7bfh7km4 1383 an...@ae...-20080618200623-29djr6bh81pmu2mu 1384 an...@ae...-20080618201105-neebgl19i1lbskta + 1373 an...@ae...-20080614130206-thshu8ln95djpgng 1374 an...@ae...-20080616113201-cexl9qhreccah10e 1375 an...@ae...-20080616113418-7qu4qxldvpxfrdp7 1376 an...@ae...-20080616113559-u5wad4bpwd9uzmd8 1377 an...@ae...-20080616122853-cwqokea7hkf82eo1 1378 an...@ae...-20080616222400-9q0vwtkk6091txce 1380 an...@ae...-20080618110315-ngg1d48fy0h3b6bs 1381 an...@ae...-20080618114001-2574od4etx4v8p9h 1382 an...@ae...-20080618200208-ysmuaq2p7bfh7km4 1383 an...@ae...-20080618200623-29djr6bh81pmu2mu 1384 an...@ae...-20080618201105-neebgl19i1lbskta 1386 an...@ae...-20080619122646-zgt191pytyx46daj Modified: trunk/src/openimagelib/py/CMakeLists.txt =================================================================== --- trunk/src/openimagelib/py/CMakeLists.txt 2008-06-19 09:16:33 UTC (rev 1388) +++ trunk/src/openimagelib/py/CMakeLists.txt 2008-06-19 12:27:04 UTC (rev 1389) @@ -14,7 +14,10 @@ ADD_LIBRARY ( ${NAME} SHARED ${SOURCES} ) MESSAGE ( "Found Python: ${PYTHON_INCLUDE_PATH} ${PYTHON_LIBRARIES} " ) -INCLUDE_DIRECTORIES ( ${PYTHON_INCLUDE_PATH} ) -TARGET_LINK_LIBRARIES ( ${NAME} ${PYTHON_LIBRARIES} ) +INCLUDE_DIRECTORIES ( ${PYTHON_INCLUDE_PATH} ${Boost_INCLUDE_DIR} ) +LINK_DIRECTORIES ( ${OpenLibraries_BINARY_DIR}/src/openimagelib/il/ ) +TARGET_LINK_LIBRARIES ( ${NAME} ${PYTHON_LIBRARIES} + ${Boost_PYTHON_LIBRARY} + "openimagelib_il${LIBRARY_IDENTIFIER}" ) INSTALL ( TARGETS ${NAME} LIBRARY DESTINATION "lib/${PACKAGE}/openimagelib/py/" ) Modified: trunk/src/openpluginlib/py/CMakeLists.txt =================================================================== --- trunk/src/openpluginlib/py/CMakeLists.txt 2008-06-19 09:16:33 UTC (rev 1388) +++ trunk/src/openpluginlib/py/CMakeLists.txt 2008-06-19 12:27:04 UTC (rev 1389) @@ -25,10 +25,11 @@ MESSAGE ( "Found Python: ${PYTHON_INCLUDE_PATH} ${PYTHON_LIBRARIES} " ) INCLUDE_DIRECTORIES ( ${PYTHON_INCLUDE_PATH} ) +LINK_DIRECTORIES ( ${OpenLibraries_BINARY_DIR}/src/openpluginlib/pl ) TARGET_LINK_LIBRARIES ( ${NAME} ${PYTHON_LIBRARIES} ${Boost_LIBRARIES} ${XML2_LIBRARIES} - ${OpenLibraries_BINARY_DIR}/src/openpluginlib/pl/libopenpluginlib_pl.so ) + "openpluginlib_pl${LIBRARY_IDENTIFIER}" ) IF ( GLEW_FOUND ) TARGET_LINK_LIBRARIES ( ${NAME} ${GLEW_LIBRARY} ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <re...@us...> - 2008-06-19 13:45:28
|
Revision: 1390 http://openlibraries.svn.sourceforge.net/openlibraries/?rev=1390&view=rev Author: rexbron Date: 2008-06-19 06:45:26 -0700 (Thu, 19 Jun 2008) Log Message: ----------- Get oal python extentions compiling and linking. Modified Paths: -------------- trunk/CMakeLists.txt trunk/src/openassetlib/CMakeLists.txt Added Paths: ----------- trunk/src/openassetlib/py/CMakeLists.txt Property Changed: ---------------- trunk/ Property changes on: trunk ___________________________________________________________________ Name: bzr:revision-info - timestamp: 2008-06-19 13:26:46.507999897 +0100 committer: Andrew Hunter <an...@ae...> properties: branch-nick: trunk + timestamp: 2008-06-19 14:45:08.145999908 +0100 committer: Andrew Hunter <an...@ae...> properties: branch-nick: trunk Name: bzr:ancestry:v3-trunk0 - an...@ae...-20080613162705-8emncakb7nkknsbj an...@ae...-20080614133032-vef9lmcgxyrauqss an...@ae...-20080614141409-u4z2pzco7bmhavlb an...@ae...-20080616112610-ky0ylmbwjn9w1mzm an...@ae...-20080616122604-vyn3c4elr33ehlai an...@ae...-20080616222235-pb4vb2oeu6cj88m4 an...@ae...-20080618110236-pfuxsos8x3wd285v an...@ae...-20080618113925-cjg8er4jn4tmc0dm an...@ae...-20080618182841-z2to60sr79wfdq9o an...@ae...-20080618190025-f4tqmfnhagk3glij an...@ae...-20080618195823-74quloizraz2fwj2 an...@ae...-20080619122406-jnh8jzrryfz26k5d + an...@ae...-20080613162705-8emncakb7nkknsbj an...@ae...-20080614133032-vef9lmcgxyrauqss an...@ae...-20080614141409-u4z2pzco7bmhavlb an...@ae...-20080616112610-ky0ylmbwjn9w1mzm an...@ae...-20080616122604-vyn3c4elr33ehlai an...@ae...-20080616222235-pb4vb2oeu6cj88m4 an...@ae...-20080618110236-pfuxsos8x3wd285v an...@ae...-20080618113925-cjg8er4jn4tmc0dm an...@ae...-20080618182841-z2to60sr79wfdq9o an...@ae...-20080618190025-f4tqmfnhagk3glij an...@ae...-20080618195823-74quloizraz2fwj2 an...@ae...-20080619122406-jnh8jzrryfz26k5d an...@ae...-20080619124658-ma0osj6o1ys7khec Name: bzr:file-ids - + src/openassetlib/py/CMakeLists.txt cmakelists.txt-20080619124548-7d7a2x77bqehzcw3-1 Name: bzr:revision-id:v3-trunk0 - 1373 an...@ae...-20080614130206-thshu8ln95djpgng 1374 an...@ae...-20080616113201-cexl9qhreccah10e 1375 an...@ae...-20080616113418-7qu4qxldvpxfrdp7 1376 an...@ae...-20080616113559-u5wad4bpwd9uzmd8 1377 an...@ae...-20080616122853-cwqokea7hkf82eo1 1378 an...@ae...-20080616222400-9q0vwtkk6091txce 1380 an...@ae...-20080618110315-ngg1d48fy0h3b6bs 1381 an...@ae...-20080618114001-2574od4etx4v8p9h 1382 an...@ae...-20080618200208-ysmuaq2p7bfh7km4 1383 an...@ae...-20080618200623-29djr6bh81pmu2mu 1384 an...@ae...-20080618201105-neebgl19i1lbskta 1386 an...@ae...-20080619122646-zgt191pytyx46daj + 1373 an...@ae...-20080614130206-thshu8ln95djpgng 1374 an...@ae...-20080616113201-cexl9qhreccah10e 1375 an...@ae...-20080616113418-7qu4qxldvpxfrdp7 1376 an...@ae...-20080616113559-u5wad4bpwd9uzmd8 1377 an...@ae...-20080616122853-cwqokea7hkf82eo1 1378 an...@ae...-20080616222400-9q0vwtkk6091txce 1380 an...@ae...-20080618110315-ngg1d48fy0h3b6bs 1381 an...@ae...-20080618114001-2574od4etx4v8p9h 1382 an...@ae...-20080618200208-ysmuaq2p7bfh7km4 1383 an...@ae...-20080618200623-29djr6bh81pmu2mu 1384 an...@ae...-20080618201105-neebgl19i1lbskta 1386 an...@ae...-20080619122646-zgt191pytyx46daj 1387 an...@ae...-20080619134508-jiifnq0kk4kskv4o Modified: trunk/CMakeLists.txt =================================================================== --- trunk/CMakeLists.txt 2008-06-19 12:27:04 UTC (rev 1389) +++ trunk/CMakeLists.txt 2008-06-19 13:45:26 UTC (rev 1390) @@ -61,6 +61,9 @@ add_definitions( -DHAVE_GL_GLEW_H ) endif ( GLEW_FOUND ) +# Python +find_package( PythonLibs ) + # kill some warnings, add some windows specific defines if ( WIN32 ) set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4273 /wd4251 /wd4503" ) Modified: trunk/src/openassetlib/CMakeLists.txt =================================================================== --- trunk/src/openassetlib/CMakeLists.txt 2008-06-19 12:27:04 UTC (rev 1389) +++ trunk/src/openassetlib/CMakeLists.txt 2008-06-19 13:45:26 UTC (rev 1390) @@ -1,2 +1,5 @@ add_subdirectory( al ) add_subdirectory( plugins ) +if ( WITH_PYTHON_EXTENTIONS ) + add_subdirectory( py ) +endif ( WITH_PYTHON_EXTENTIONS ) Added: trunk/src/openassetlib/py/CMakeLists.txt =================================================================== --- trunk/src/openassetlib/py/CMakeLists.txt (rev 0) +++ trunk/src/openassetlib/py/CMakeLists.txt 2008-06-19 13:45:26 UTC (rev 1390) @@ -0,0 +1,23 @@ +INCLUDE_DIRECTORIES ( ${OpenLibraries_SOURCE_DIR}/src ) + +set ( NAME openassetlib_py ) + +set ( SOURCES asset.cpp + guid.cpp + openassetlib.cpp + plugin.cpp + py.hpp + py.cpp + python.hpp + set.cpp ) + +add_library ( ${NAME} SHARED ${SOURCES} ) + +include_directories ( ${Boost_INCLUDE_DIR} + ${PYTHON_INCLUDE_PATH}) +link_directories ( ${OpenLibraries_BINARY_DIR}/src/openassetlib/al/ ) +target_link_libraries ( ${NAME} ${PYTHON_LIBRARIES} + ${Boost_PYTHON_LIBRARY} + "openassetlib_al${LIBRARY_IDENTIFIER}" ) + +install ( TARGETS ${NAME} LIBRARY DESTINATION "lib/${PACKAGE}/openassetlib/py/" ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <re...@us...> - 2008-06-19 13:47:58
|
Revision: 1391 http://openlibraries.svn.sourceforge.net/openlibraries/?rev=1391&view=rev Author: rexbron Date: 2008-06-19 06:47:55 -0700 (Thu, 19 Jun 2008) Log Message: ----------- Get sqlite plugin for oal compiling and building on linux at least. FindSQLITE3.cmake needs to be extended for other platforms. Modified Paths: -------------- trunk/src/openassetlib/plugins/sqlite/sqlite3_metadata.cpp trunk/src/openassetlib/plugins/sqlite/sqlite3_metadata_plugin.cpp trunk/src/openassetlib/plugins/sqlite/sqlite3_metadata_plugin.hpp Added Paths: ----------- trunk/FindSQLITE3.cmake Property Changed: ---------------- trunk/ Property changes on: trunk ___________________________________________________________________ Name: bzr:revision-info - timestamp: 2008-06-19 14:45:08.145999908 +0100 committer: Andrew Hunter <an...@ae...> properties: branch-nick: trunk + timestamp: 2008-06-19 14:47:37.088999987 +0100 committer: Andrew Hunter <an...@ae...> properties: branch-nick: trunk Name: bzr:ancestry:v3-trunk0 - an...@ae...-20080613162705-8emncakb7nkknsbj an...@ae...-20080614133032-vef9lmcgxyrauqss an...@ae...-20080614141409-u4z2pzco7bmhavlb an...@ae...-20080616112610-ky0ylmbwjn9w1mzm an...@ae...-20080616122604-vyn3c4elr33ehlai an...@ae...-20080616222235-pb4vb2oeu6cj88m4 an...@ae...-20080618110236-pfuxsos8x3wd285v an...@ae...-20080618113925-cjg8er4jn4tmc0dm an...@ae...-20080618182841-z2to60sr79wfdq9o an...@ae...-20080618190025-f4tqmfnhagk3glij an...@ae...-20080618195823-74quloizraz2fwj2 an...@ae...-20080619122406-jnh8jzrryfz26k5d an...@ae...-20080619124658-ma0osj6o1ys7khec + an...@ae...-20080613162705-8emncakb7nkknsbj an...@ae...-20080614133032-vef9lmcgxyrauqss an...@ae...-20080614141409-u4z2pzco7bmhavlb an...@ae...-20080616112610-ky0ylmbwjn9w1mzm an...@ae...-20080616122604-vyn3c4elr33ehlai an...@ae...-20080616222235-pb4vb2oeu6cj88m4 an...@ae...-20080618110236-pfuxsos8x3wd285v an...@ae...-20080618113925-cjg8er4jn4tmc0dm an...@ae...-20080618182841-z2to60sr79wfdq9o an...@ae...-20080618190025-f4tqmfnhagk3glij an...@ae...-20080618195823-74quloizraz2fwj2 an...@ae...-20080619122406-jnh8jzrryfz26k5d an...@ae...-20080619124658-ma0osj6o1ys7khec an...@ae...-20080619134156-uy4fm1k8kygexnbq Name: bzr:file-ids - src/openassetlib/py/CMakeLists.txt cmakelists.txt-20080619124548-7d7a2x77bqehzcw3-1 + FindSQLITE3.cmake findsqlite3.cmake-20080619125653-kefb9nk24i58nsa0-1 Name: bzr:revision-id:v3-trunk0 - 1373 an...@ae...-20080614130206-thshu8ln95djpgng 1374 an...@ae...-20080616113201-cexl9qhreccah10e 1375 an...@ae...-20080616113418-7qu4qxldvpxfrdp7 1376 an...@ae...-20080616113559-u5wad4bpwd9uzmd8 1377 an...@ae...-20080616122853-cwqokea7hkf82eo1 1378 an...@ae...-20080616222400-9q0vwtkk6091txce 1380 an...@ae...-20080618110315-ngg1d48fy0h3b6bs 1381 an...@ae...-20080618114001-2574od4etx4v8p9h 1382 an...@ae...-20080618200208-ysmuaq2p7bfh7km4 1383 an...@ae...-20080618200623-29djr6bh81pmu2mu 1384 an...@ae...-20080618201105-neebgl19i1lbskta 1386 an...@ae...-20080619122646-zgt191pytyx46daj 1387 an...@ae...-20080619134508-jiifnq0kk4kskv4o + 1373 an...@ae...-20080614130206-thshu8ln95djpgng 1374 an...@ae...-20080616113201-cexl9qhreccah10e 1375 an...@ae...-20080616113418-7qu4qxldvpxfrdp7 1376 an...@ae...-20080616113559-u5wad4bpwd9uzmd8 1377 an...@ae...-20080616122853-cwqokea7hkf82eo1 1378 an...@ae...-20080616222400-9q0vwtkk6091txce 1380 an...@ae...-20080618110315-ngg1d48fy0h3b6bs 1381 an...@ae...-20080618114001-2574od4etx4v8p9h 1382 an...@ae...-20080618200208-ysmuaq2p7bfh7km4 1383 an...@ae...-20080618200623-29djr6bh81pmu2mu 1384 an...@ae...-20080618201105-neebgl19i1lbskta 1386 an...@ae...-20080619122646-zgt191pytyx46daj 1387 an...@ae...-20080619134508-jiifnq0kk4kskv4o 1388 an...@ae...-20080619134737-wcqb6ptssduanj6y Added: trunk/FindSQLITE3.cmake =================================================================== --- trunk/FindSQLITE3.cmake (rev 0) +++ trunk/FindSQLITE3.cmake 2008-06-19 13:47:55 UTC (rev 1391) @@ -0,0 +1,42 @@ +# - Try to find SQLITE3 +# Once done this will define +# +# SQLITE3_FOUND - system has SQLITE3 +# SQLITE3_INCLUDE_DIR - the SQLITE3 include directory +# SQLITE3_LIBRARIES - Link these to use SQLITE3 +# SQLITE3_DEFINITIONS - Compiler switches required for using SQLITE3 +# Redistribution and use is allowed according to the terms of the BSD license. +# For details see the accompanying COPYING-CMAKE-SCRIPTS file. +# + + +if ( SQLITE3_INCLUDE_DIR AND SQLITE3_LIBRARIES ) + # in cache already + SET(SQLITE3_FIND_QUIETLY TRUE) +endif ( SQLITE3_INCLUDE_DIR AND SQLITE3_LIBRARIES ) + +# use pkg-config to get the directories and then use these values +# in the FIND_PATH() and FIND_LIBRARY() calls +if( NOT WIN32 ) + INCLUDE(FindPkgConfig) + + pkg_check_modules(SQLITE3 REQUIRED sqlite3 ) + +endif( NOT WIN32 ) + +#FIND_PATH(SQLITE3_INCLUDE_DIR NAMES sqlite3.h +# PATHS +# ${_SQLITE3IncDir} +#) + +#FIND_LIBRARY(SQLITE3_LIBRARIES NAMES sqlite3 +# PATHS +# ${_SQLITE3LinkDir} +#) + +#include(FindPackageHandleStandardArgs) +#FIND_PACKAGE_HANDLE_STANDARD_ARGS(SQLITE3 DEFAULT_MSG SQLITE3_INCLUDE_DIR SQLITE3_LIBRARIES ) + +# show the SQLITE3_INCLUDE_DIR and SQLITE3_LIBRARIES variables only in the advanced view +MARK_AS_ADVANCED(SQLITE3_INCLUDE_DIR SQLITE3_LIBRARIES ) + Modified: trunk/src/openassetlib/plugins/sqlite/sqlite3_metadata.cpp =================================================================== --- trunk/src/openassetlib/plugins/sqlite/sqlite3_metadata.cpp 2008-06-19 13:45:26 UTC (rev 1390) +++ trunk/src/openassetlib/plugins/sqlite/sqlite3_metadata.cpp 2008-06-19 13:47:55 UTC (rev 1391) @@ -5,7 +5,7 @@ // For more information, see http://www.openlibraries.org. #include <boost/thread/recursive_mutex.hpp> -#include <openassetlib/plugins/sqlite/sqlite3_metadata_plugin.hpp> +#include "sqlite3_metadata_plugin.hpp" namespace opl = olib::openpluginlib; namespace oal = olib::openassetlib; Modified: trunk/src/openassetlib/plugins/sqlite/sqlite3_metadata_plugin.cpp =================================================================== --- trunk/src/openassetlib/plugins/sqlite/sqlite3_metadata_plugin.cpp 2008-06-19 13:45:26 UTC (rev 1390) +++ trunk/src/openassetlib/plugins/sqlite/sqlite3_metadata_plugin.cpp 2008-06-19 13:47:55 UTC (rev 1391) @@ -18,8 +18,8 @@ # include <libxml/parser.h> #endif -#include <openassetlib/plugins/sqlite/sqlite3_metadata_plugin.hpp> -#include <openassetlib/plugins/sqlite/database.hpp> +#include "sqlite3_metadata_plugin.hpp" +#include "database.hpp" namespace olib { namespace openassetlib { namespace plugins { namespace sqlite3 { Modified: trunk/src/openassetlib/plugins/sqlite/sqlite3_metadata_plugin.hpp =================================================================== --- trunk/src/openassetlib/plugins/sqlite/sqlite3_metadata_plugin.hpp 2008-06-19 13:45:26 UTC (rev 1390) +++ trunk/src/openassetlib/plugins/sqlite/sqlite3_metadata_plugin.hpp 2008-06-19 13:47:55 UTC (rev 1391) @@ -7,8 +7,8 @@ #ifndef SQLITE3_METADATA_PLUGIN_INC_ #define SQLITE3_METADATA_PLUGIN_INC_ -#include <openassetlib/plugins/sqlite/config.hpp> -#include <openassetlib/al/al_plugin.hpp> +#include "config.hpp" +#include "openassetlib/al/al_plugin.hpp" namespace opl = olib::openpluginlib; namespace al = olib::openassetlib::al; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <re...@us...> - 2008-06-19 13:49:14
|
Revision: 1392 http://openlibraries.svn.sourceforge.net/openlibraries/?rev=1392&view=rev Author: rexbron Date: 2008-06-19 06:49:13 -0700 (Thu, 19 Jun 2008) Log Message: ----------- Remeber to add cmake files to vcs... Added Paths: ----------- trunk/src/openassetlib/plugins/sqlite/CMakeLists.txt Property Changed: ---------------- trunk/ Property changes on: trunk ___________________________________________________________________ Name: bzr:revision-info - timestamp: 2008-06-19 14:47:37.088999987 +0100 committer: Andrew Hunter <an...@ae...> properties: branch-nick: trunk + timestamp: 2008-06-19 14:48:57.706000090 +0100 committer: Andrew Hunter <an...@ae...> properties: branch-nick: trunk Name: bzr:ancestry:v3-trunk0 - an...@ae...-20080613162705-8emncakb7nkknsbj an...@ae...-20080614133032-vef9lmcgxyrauqss an...@ae...-20080614141409-u4z2pzco7bmhavlb an...@ae...-20080616112610-ky0ylmbwjn9w1mzm an...@ae...-20080616122604-vyn3c4elr33ehlai an...@ae...-20080616222235-pb4vb2oeu6cj88m4 an...@ae...-20080618110236-pfuxsos8x3wd285v an...@ae...-20080618113925-cjg8er4jn4tmc0dm an...@ae...-20080618182841-z2to60sr79wfdq9o an...@ae...-20080618190025-f4tqmfnhagk3glij an...@ae...-20080618195823-74quloizraz2fwj2 an...@ae...-20080619122406-jnh8jzrryfz26k5d an...@ae...-20080619124658-ma0osj6o1ys7khec an...@ae...-20080619134156-uy4fm1k8kygexnbq + an...@ae...-20080613162705-8emncakb7nkknsbj an...@ae...-20080614133032-vef9lmcgxyrauqss an...@ae...-20080614141409-u4z2pzco7bmhavlb an...@ae...-20080616112610-ky0ylmbwjn9w1mzm an...@ae...-20080616122604-vyn3c4elr33ehlai an...@ae...-20080616222235-pb4vb2oeu6cj88m4 an...@ae...-20080618110236-pfuxsos8x3wd285v an...@ae...-20080618113925-cjg8er4jn4tmc0dm an...@ae...-20080618182841-z2to60sr79wfdq9o an...@ae...-20080618190025-f4tqmfnhagk3glij an...@ae...-20080618195823-74quloizraz2fwj2 an...@ae...-20080619122406-jnh8jzrryfz26k5d an...@ae...-20080619124658-ma0osj6o1ys7khec an...@ae...-20080619134156-uy4fm1k8kygexnbq an...@ae...-20080619134821-m149jig6bmpq41hx Name: bzr:file-ids - FindSQLITE3.cmake findsqlite3.cmake-20080619125653-kefb9nk24i58nsa0-1 + src/openassetlib/plugins/sqlite/CMakeLists.txt cmakelists.txt-20080619134758-nm4h00bctuwzlq9y-1 Name: bzr:revision-id:v3-trunk0 - 1373 an...@ae...-20080614130206-thshu8ln95djpgng 1374 an...@ae...-20080616113201-cexl9qhreccah10e 1375 an...@ae...-20080616113418-7qu4qxldvpxfrdp7 1376 an...@ae...-20080616113559-u5wad4bpwd9uzmd8 1377 an...@ae...-20080616122853-cwqokea7hkf82eo1 1378 an...@ae...-20080616222400-9q0vwtkk6091txce 1380 an...@ae...-20080618110315-ngg1d48fy0h3b6bs 1381 an...@ae...-20080618114001-2574od4etx4v8p9h 1382 an...@ae...-20080618200208-ysmuaq2p7bfh7km4 1383 an...@ae...-20080618200623-29djr6bh81pmu2mu 1384 an...@ae...-20080618201105-neebgl19i1lbskta 1386 an...@ae...-20080619122646-zgt191pytyx46daj 1387 an...@ae...-20080619134508-jiifnq0kk4kskv4o 1388 an...@ae...-20080619134737-wcqb6ptssduanj6y + 1373 an...@ae...-20080614130206-thshu8ln95djpgng 1374 an...@ae...-20080616113201-cexl9qhreccah10e 1375 an...@ae...-20080616113418-7qu4qxldvpxfrdp7 1376 an...@ae...-20080616113559-u5wad4bpwd9uzmd8 1377 an...@ae...-20080616122853-cwqokea7hkf82eo1 1378 an...@ae...-20080616222400-9q0vwtkk6091txce 1380 an...@ae...-20080618110315-ngg1d48fy0h3b6bs 1381 an...@ae...-20080618114001-2574od4etx4v8p9h 1382 an...@ae...-20080618200208-ysmuaq2p7bfh7km4 1383 an...@ae...-20080618200623-29djr6bh81pmu2mu 1384 an...@ae...-20080618201105-neebgl19i1lbskta 1386 an...@ae...-20080619122646-zgt191pytyx46daj 1387 an...@ae...-20080619134508-jiifnq0kk4kskv4o 1388 an...@ae...-20080619134737-wcqb6ptssduanj6y 1389 an...@ae...-20080619134857-7k2kawpsxgqb9ss6 Added: trunk/src/openassetlib/plugins/sqlite/CMakeLists.txt =================================================================== --- trunk/src/openassetlib/plugins/sqlite/CMakeLists.txt (rev 0) +++ trunk/src/openassetlib/plugins/sqlite/CMakeLists.txt 2008-06-19 13:49:13 UTC (rev 1392) @@ -0,0 +1,25 @@ +find_package ( SQLITE3 ) +include_directories ( ${OpenLibraries_SOURCE_DIR}/src ) + +if (SQLITE3_FOUND ) + set ( NAME sqlite_plugin ) + + set ( SOURCES config.hpp + sqlite3_metadata.cpp + sqlite3_metadata_plugin.hpp + sqlite3_metadata_plugin.cpp + database.hpp + database.cpp + sqlite3.h ) + + add_library ( ${NAME} SHARED ${SOURCES} ) + include_directories ( ${OpenLibraries_SOURCE_DIR} + ${Boost_INCLUDE_DIR} + ${SQLITE3_INCLUDE_DIR} ) + link_directories ( ${OpenLibraries_BINARY_DIR}/src/openassetlib/al/ ) + target_link_libraries ( ${NAME} ${Boost_FILESYSTEM_LIBRARY} + ${XML2_LIBRARIES} + ${SQLITE3_LIBRARIES}) + install ( TARGETS ${NAME} LIBRARY DESTINATION "lib/${PACKAGE}/openassetlib/plugins/sqlite/" ) + install ( FILES sqlite3_metadata_plugin.opl DESTINATION "lib/${PACKAGE}/openassetlib/plugins/sqlite/" ) +endif ( SQLITE3_FOUND ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <re...@us...> - 2008-06-19 14:11:04
|
Revision: 1393 http://openlibraries.svn.sourceforge.net/openlibraries/?rev=1393&view=rev Author: rexbron Date: 2008-06-19 07:10:59 -0700 (Thu, 19 Jun 2008) Log Message: ----------- Use options instead of comandline varriables. Modified Paths: -------------- trunk/CMakeLists.txt Property Changed: ---------------- trunk/ Property changes on: trunk ___________________________________________________________________ Name: bzr:revision-info - timestamp: 2008-06-19 14:48:57.706000090 +0100 committer: Andrew Hunter <an...@ae...> properties: branch-nick: trunk + timestamp: 2008-06-19 15:10:46.039000034 +0100 committer: Andrew Hunter <an...@ae...> properties: branch-nick: trunk Name: bzr:ancestry:v3-trunk0 - an...@ae...-20080613162705-8emncakb7nkknsbj an...@ae...-20080614133032-vef9lmcgxyrauqss an...@ae...-20080614141409-u4z2pzco7bmhavlb an...@ae...-20080616112610-ky0ylmbwjn9w1mzm an...@ae...-20080616122604-vyn3c4elr33ehlai an...@ae...-20080616222235-pb4vb2oeu6cj88m4 an...@ae...-20080618110236-pfuxsos8x3wd285v an...@ae...-20080618113925-cjg8er4jn4tmc0dm an...@ae...-20080618182841-z2to60sr79wfdq9o an...@ae...-20080618190025-f4tqmfnhagk3glij an...@ae...-20080618195823-74quloizraz2fwj2 an...@ae...-20080619122406-jnh8jzrryfz26k5d an...@ae...-20080619124658-ma0osj6o1ys7khec an...@ae...-20080619134156-uy4fm1k8kygexnbq an...@ae...-20080619134821-m149jig6bmpq41hx + an...@ae...-20080613162705-8emncakb7nkknsbj an...@ae...-20080614133032-vef9lmcgxyrauqss an...@ae...-20080614141409-u4z2pzco7bmhavlb an...@ae...-20080616112610-ky0ylmbwjn9w1mzm an...@ae...-20080616122604-vyn3c4elr33ehlai an...@ae...-20080616222235-pb4vb2oeu6cj88m4 an...@ae...-20080618110236-pfuxsos8x3wd285v an...@ae...-20080618113925-cjg8er4jn4tmc0dm an...@ae...-20080618182841-z2to60sr79wfdq9o an...@ae...-20080618190025-f4tqmfnhagk3glij an...@ae...-20080618195823-74quloizraz2fwj2 an...@ae...-20080619122406-jnh8jzrryfz26k5d an...@ae...-20080619124658-ma0osj6o1ys7khec an...@ae...-20080619134156-uy4fm1k8kygexnbq an...@ae...-20080619134821-m149jig6bmpq41hx an...@ae...-20080619141005-75220r6w2cvqbj8f Name: bzr:file-ids - src/openassetlib/plugins/sqlite/CMakeLists.txt cmakelists.txt-20080619134758-nm4h00bctuwzlq9y-1 + Name: bzr:revision-id:v3-trunk0 - 1373 an...@ae...-20080614130206-thshu8ln95djpgng 1374 an...@ae...-20080616113201-cexl9qhreccah10e 1375 an...@ae...-20080616113418-7qu4qxldvpxfrdp7 1376 an...@ae...-20080616113559-u5wad4bpwd9uzmd8 1377 an...@ae...-20080616122853-cwqokea7hkf82eo1 1378 an...@ae...-20080616222400-9q0vwtkk6091txce 1380 an...@ae...-20080618110315-ngg1d48fy0h3b6bs 1381 an...@ae...-20080618114001-2574od4etx4v8p9h 1382 an...@ae...-20080618200208-ysmuaq2p7bfh7km4 1383 an...@ae...-20080618200623-29djr6bh81pmu2mu 1384 an...@ae...-20080618201105-neebgl19i1lbskta 1386 an...@ae...-20080619122646-zgt191pytyx46daj 1387 an...@ae...-20080619134508-jiifnq0kk4kskv4o 1388 an...@ae...-20080619134737-wcqb6ptssduanj6y 1389 an...@ae...-20080619134857-7k2kawpsxgqb9ss6 + 1373 an...@ae...-20080614130206-thshu8ln95djpgng 1374 an...@ae...-20080616113201-cexl9qhreccah10e 1375 an...@ae...-20080616113418-7qu4qxldvpxfrdp7 1376 an...@ae...-20080616113559-u5wad4bpwd9uzmd8 1377 an...@ae...-20080616122853-cwqokea7hkf82eo1 1378 an...@ae...-20080616222400-9q0vwtkk6091txce 1380 an...@ae...-20080618110315-ngg1d48fy0h3b6bs 1381 an...@ae...-20080618114001-2574od4etx4v8p9h 1382 an...@ae...-20080618200208-ysmuaq2p7bfh7km4 1383 an...@ae...-20080618200623-29djr6bh81pmu2mu 1384 an...@ae...-20080618201105-neebgl19i1lbskta 1386 an...@ae...-20080619122646-zgt191pytyx46daj 1387 an...@ae...-20080619134508-jiifnq0kk4kskv4o 1388 an...@ae...-20080619134737-wcqb6ptssduanj6y 1389 an...@ae...-20080619134857-7k2kawpsxgqb9ss6 1390 an...@ae...-20080619141046-tgdq69hsumw4x55z Modified: trunk/CMakeLists.txt =================================================================== --- trunk/CMakeLists.txt 2008-06-19 13:49:13 UTC (rev 1392) +++ trunk/CMakeLists.txt 2008-06-19 14:10:59 UTC (rev 1393) @@ -90,4 +90,9 @@ ENDIF ( NOT APPLE ) ENDIF ( UNIX ) +# Define options + +option ( WITH_PYTHON_EXTENTIONS "Compile the python extentions for OpenLibraries." TRUE ) +option ( WITH_OPENFX_PLUGIN "Compile the OpenFX plugin for openmedialib." FALSE ) + add_subdirectory( src ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <re...@us...> - 2008-06-20 11:32:58
|
Revision: 1394 http://openlibraries.svn.sourceforge.net/openlibraries/?rev=1394&view=rev Author: rexbron Date: 2008-06-20 04:32:55 -0700 (Fri, 20 Jun 2008) Log Message: ----------- Build oil plugins on linux. Modified Paths: -------------- trunk/FindOpenEXR.cmake Added Paths: ----------- trunk/src/openimagelib/plugins/bmp/CMakeLists.txt trunk/src/openimagelib/plugins/dds/CMakeLists.txt trunk/src/openimagelib/plugins/dpx/CMakeLists.txt trunk/src/openimagelib/plugins/exr/CMakeLists.txt trunk/src/openimagelib/plugins/hdr/CMakeLists.txt trunk/src/openimagelib/plugins/png/CMakeLists.txt trunk/src/openimagelib/plugins/psd/CMakeLists.txt trunk/src/openimagelib/plugins/sgi/CMakeLists.txt trunk/src/openimagelib/plugins/tga/CMakeLists.txt Property Changed: ---------------- trunk/ Property changes on: trunk ___________________________________________________________________ Name: bzr:revision-info - timestamp: 2008-06-19 15:10:46.039000034 +0100 committer: Andrew Hunter <an...@ae...> properties: branch-nick: trunk + timestamp: 2008-06-20 12:32:24.180000067 +0100 committer: Andrew Hunter <an...@ae...> properties: branch-nick: trunk Name: bzr:ancestry:v3-trunk0 - an...@ae...-20080613162705-8emncakb7nkknsbj an...@ae...-20080614133032-vef9lmcgxyrauqss an...@ae...-20080614141409-u4z2pzco7bmhavlb an...@ae...-20080616112610-ky0ylmbwjn9w1mzm an...@ae...-20080616122604-vyn3c4elr33ehlai an...@ae...-20080616222235-pb4vb2oeu6cj88m4 an...@ae...-20080618110236-pfuxsos8x3wd285v an...@ae...-20080618113925-cjg8er4jn4tmc0dm an...@ae...-20080618182841-z2to60sr79wfdq9o an...@ae...-20080618190025-f4tqmfnhagk3glij an...@ae...-20080618195823-74quloizraz2fwj2 an...@ae...-20080619122406-jnh8jzrryfz26k5d an...@ae...-20080619124658-ma0osj6o1ys7khec an...@ae...-20080619134156-uy4fm1k8kygexnbq an...@ae...-20080619134821-m149jig6bmpq41hx an...@ae...-20080619141005-75220r6w2cvqbj8f + an...@ae...-20080613162705-8emncakb7nkknsbj an...@ae...-20080614133032-vef9lmcgxyrauqss an...@ae...-20080614141409-u4z2pzco7bmhavlb an...@ae...-20080616112610-ky0ylmbwjn9w1mzm an...@ae...-20080616122604-vyn3c4elr33ehlai an...@ae...-20080616222235-pb4vb2oeu6cj88m4 an...@ae...-20080618110236-pfuxsos8x3wd285v an...@ae...-20080618113925-cjg8er4jn4tmc0dm an...@ae...-20080618182841-z2to60sr79wfdq9o an...@ae...-20080618190025-f4tqmfnhagk3glij an...@ae...-20080618195823-74quloizraz2fwj2 an...@ae...-20080619122406-jnh8jzrryfz26k5d an...@ae...-20080619124658-ma0osj6o1ys7khec an...@ae...-20080619134156-uy4fm1k8kygexnbq an...@ae...-20080619134821-m149jig6bmpq41hx an...@ae...-20080619141005-75220r6w2cvqbj8f an...@ae...-20080620064802-8b2g4wfk32dn8mmz Name: bzr:file-ids - + src/openimagelib/plugins/bmp/CMakeLists.txt cmakelists.txt-20080620054117-eojq7cb6mkwmdhrt-1 src/openimagelib/plugins/dds/CMakeLists.txt cmakelists.txt-20080620054316-rh0ne5gsqn1wu7x7-1 src/openimagelib/plugins/dpx/CMakeLists.txt cmakelists.txt-20080620053537-iis5yie2yksbjc7s-1 src/openimagelib/plugins/exr/CMakeLists.txt cmakelists.txt-20080620063034-pwotrghy7ty4d9he-1 src/openimagelib/plugins/hdr/CMakeLists.txt cmakelists.txt-20080620063336-38shdw7234ewciiz-1 src/openimagelib/plugins/png/CMakeLists.txt cmakelists.txt-20080620064009-bafahiyohvou2xsb-1 src/openimagelib/plugins/psd/CMakeLists.txt cmakelists.txt-20080620064324-vbvaeoaxtm8km7eg-1 src/openimagelib/plugins/sgi/CMakeLists.txt cmakelists.txt-20080620064519-tohfk8jnqisxmg2u-1 src/openimagelib/plugins/tga/CMakeLists.txt cmakelists.txt-20080620064801-7n6khilt26k2aif8-1 Name: bzr:revision-id:v3-trunk0 - 1373 an...@ae...-20080614130206-thshu8ln95djpgng 1374 an...@ae...-20080616113201-cexl9qhreccah10e 1375 an...@ae...-20080616113418-7qu4qxldvpxfrdp7 1376 an...@ae...-20080616113559-u5wad4bpwd9uzmd8 1377 an...@ae...-20080616122853-cwqokea7hkf82eo1 1378 an...@ae...-20080616222400-9q0vwtkk6091txce 1380 an...@ae...-20080618110315-ngg1d48fy0h3b6bs 1381 an...@ae...-20080618114001-2574od4etx4v8p9h 1382 an...@ae...-20080618200208-ysmuaq2p7bfh7km4 1383 an...@ae...-20080618200623-29djr6bh81pmu2mu 1384 an...@ae...-20080618201105-neebgl19i1lbskta 1386 an...@ae...-20080619122646-zgt191pytyx46daj 1387 an...@ae...-20080619134508-jiifnq0kk4kskv4o 1388 an...@ae...-20080619134737-wcqb6ptssduanj6y 1389 an...@ae...-20080619134857-7k2kawpsxgqb9ss6 1390 an...@ae...-20080619141046-tgdq69hsumw4x55z + 1373 an...@ae...-20080614130206-thshu8ln95djpgng 1374 an...@ae...-20080616113201-cexl9qhreccah10e 1375 an...@ae...-20080616113418-7qu4qxldvpxfrdp7 1376 an...@ae...-20080616113559-u5wad4bpwd9uzmd8 1377 an...@ae...-20080616122853-cwqokea7hkf82eo1 1378 an...@ae...-20080616222400-9q0vwtkk6091txce 1380 an...@ae...-20080618110315-ngg1d48fy0h3b6bs 1381 an...@ae...-20080618114001-2574od4etx4v8p9h 1382 an...@ae...-20080618200208-ysmuaq2p7bfh7km4 1383 an...@ae...-20080618200623-29djr6bh81pmu2mu 1384 an...@ae...-20080618201105-neebgl19i1lbskta 1386 an...@ae...-20080619122646-zgt191pytyx46daj 1387 an...@ae...-20080619134508-jiifnq0kk4kskv4o 1388 an...@ae...-20080619134737-wcqb6ptssduanj6y 1389 an...@ae...-20080619134857-7k2kawpsxgqb9ss6 1390 an...@ae...-20080619141046-tgdq69hsumw4x55z 1391 an...@ae...-20080620113224-d5thhgo782mw0rjo Modified: trunk/FindOpenEXR.cmake =================================================================== --- trunk/FindOpenEXR.cmake 2008-06-19 14:10:59 UTC (rev 1393) +++ trunk/FindOpenEXR.cmake 2008-06-20 11:32:55 UTC (rev 1394) @@ -10,35 +10,46 @@ # -if ( OPENEXR_INCLUDE_DIR AND OPENEXR_LIBRARIES ) +if ( OpenEXR_INCLUDE_DIR AND OpenEXR_LIBRARIES ) # in cache already SET(OpenEXR_FIND_QUIETLY TRUE) -endif ( OPENEXR_INCLUDE_DIR AND OPENEXR_LIBRARIES ) +endif ( OpenEXR_INCLUDE_DIR AND OpenEXR_LIBRARIES ) # use pkg-config to get the directories and then use these values # in the FIND_PATH() and FIND_LIBRARY() calls if( NOT WIN32 ) - INCLUDE(UsePkgConfig) + INCLUDE(FindPkgConfig) - PKGCONFIG(OpenEXR _OpenEXRIncDir _OpenEXRLinkDir _OpenEXRLinkFlags _OpenEXRCflags) + pkg_check_modules(OpenEXR OpenEXR ) + pkg_check_modules(IlmBase IlmBase) - SET(OPENEXR_DEFINITIONS ${_OpenEXRCflags}) + find_library ( OpenEXR_LIBRARIES NAMES IlmImf ) + find_library ( Iex_LIBRARIES NAMES Iex ) + find_library ( Half_LIBRARIES NAMES Half ) + find_library ( Imath_LIBRARIES NAMES Imath ) + find_library ( IlmThread_LIBRARIES NAMES IlmThread ) + + set ( IlmBase_LIBRARIES ${Iex_LIBRARIES} ${Half_LIBRARUES} ${Imath_LIBRARIES} ${IlmThread_LIBRARIES} ) + + set ( OpenEXR_INCLUDE_DIR ${OpenEXR_INCLUDE_DIR} ${IlmBase_INCLUDE_DIR} ) + set ( OpenEXR_LIBRARIES ${OpenEXR_LIBRARIES} ${IlmBase_LIBRARIES} ) + endif( NOT WIN32 ) -FIND_PATH(OPENEXR_INCLUDE_DIR NAMES OpenEXRConfig.h - PATHS - ${_OpenEXRIncDir} - PATH_SUFFIXES OpenEXR -) +#FIND_PATH(OPENEXR_INCLUDE_DIR NAMES OpenEXRConfig.h +# PATHS +# ${_OpenEXRIncDir} +# PATH_SUFFIXES OpenEXR +#) -FIND_LIBRARY(OPENEXR_LIBRARIES NAMES IlmIlf - PATHS - ${_OpenEXRLinkDir} -) +#FIND_LIBRARY(OPENEXR_LIBRARIES NAMES IlmIlf +# PATHS +# ${_OpenEXRLinkDir} +#) include(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenEXR DEFAULT_MSG OPENEXR_INCLUDE_DIR OPENEXR_LIBRARIES ) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenEXR DEFAULT_MSG OpenEXR_INCLUDE_DIR OpenEXR_LIBRARIES ) # show the OPENEXR_INCLUDE_DIR and OPENEXR_LIBRARIES variables only in the advanced view -MARK_AS_ADVANCED(OPENEXR_INCLUDE_DIR OPENEXR_LIBRARIES ) +MARK_AS_ADVANCED(OpenEXR_INCLUDE_DIR OpenEXR_LIBRARIES ) Added: trunk/src/openimagelib/plugins/bmp/CMakeLists.txt =================================================================== --- trunk/src/openimagelib/plugins/bmp/CMakeLists.txt (rev 0) +++ trunk/src/openimagelib/plugins/bmp/CMakeLists.txt 2008-06-20 11:32:55 UTC (rev 1394) @@ -0,0 +1,17 @@ +set ( NAME openimagelib_bmp ) + +set ( SOURCES bmp_plugin.cpp ) + +include_directories ( ${Boost_INCLUDE_DIR}i + ${OpenLibraries_SOURCE_DIR}/src ) + +add_library ( ${NAME} SHARED ${SOURCES} ) + +link_directories ( ${OpenLibraries_BINARY_DIR}/src/openpluginlib/pl/ + ${OpenLibraries_BINARY_DIR}/src/openimagelib/il/ ) + +target_link_libraries ( ${NAME} "openpluginlib_pl${LIBRARY_IDENTIFIER}" + "openimagelib_il${LIBRARY_IDENTIFIER}" ) + +install ( TARGETS ${NAME} LIBRARY DESTINATION "lib/${PACKAGE}/openimagelib/plugins/bmp/" ) +install ( FILES bmp_plugin.opl DESTINATION "lib/${PACKAGE}/openimagelib/plugins/bmp/" ) Added: trunk/src/openimagelib/plugins/dds/CMakeLists.txt =================================================================== --- trunk/src/openimagelib/plugins/dds/CMakeLists.txt (rev 0) +++ trunk/src/openimagelib/plugins/dds/CMakeLists.txt 2008-06-20 11:32:55 UTC (rev 1394) @@ -0,0 +1,17 @@ +set ( NAME openimagelib_dds ) + +set ( SOURCES dds_plugin.cpp ) + +include_directories ( ${Boost_INCLUDE_DIR}i + ${OpenLibraries_SOURCE_DIR}/src ) + +add_library ( ${NAME} SHARED ${SOURCES} ) + +link_directories ( ${OpenLibraries_BINARY_DIR}/src/openpluginlib/pl/ + ${OpenLibraries_BINARY_DIR}/src/openimagelib/il/ ) + +target_link_libraries ( ${NAME} "openpluginlib_pl${LIBRARY_IDENTIFIER}" + "openimagelib_il${LIBRARY_IDENTIFIER}" ) + +install ( TARGETS ${NAME} LIBRARY DESTINATION "lib/${PACKAGE}/openimagelib/plugins/dds/" ) +install ( FILES dds_plugin.opl DESTINATION "lib/${PACKAGE}/openimagelib/plugins/dds/" ) Added: trunk/src/openimagelib/plugins/dpx/CMakeLists.txt =================================================================== --- trunk/src/openimagelib/plugins/dpx/CMakeLists.txt (rev 0) +++ trunk/src/openimagelib/plugins/dpx/CMakeLists.txt 2008-06-20 11:32:55 UTC (rev 1394) @@ -0,0 +1,17 @@ +set ( NAME openimagelib_dpx ) + +set ( SOURCES dpx_plugin.cpp ) + +include_directories ( ${Boost_INCLUDE_DIR}i + ${OpenLibraries_SOURCE_DIR}/src ) + +add_library ( ${NAME} SHARED ${SOURCES} ) + +link_directories ( ${OpenLibraries_BINARY_DIR}/src/openpluginlib/pl/ + ${OpenLibraries_BINARY_DIR}/src/openimagelib/il/ ) + +target_link_libraries ( ${NAME} "openpluginlib_pl${LIBRARY_IDENTIFIER}" + "openimagelib_il${LIBRARY_IDENTIFIER}" ) + +install ( TARGETS ${NAME} LIBRARY DESTINATION "lib/${PACKAGE}/openimagelib/plugins/dpx/" ) +install ( FILES dpx_plugin.opl DESTINATION "lib/${PACKAGE}/openimagelib/plugins/dpx/" ) Added: trunk/src/openimagelib/plugins/exr/CMakeLists.txt =================================================================== --- trunk/src/openimagelib/plugins/exr/CMakeLists.txt (rev 0) +++ trunk/src/openimagelib/plugins/exr/CMakeLists.txt 2008-06-20 11:32:55 UTC (rev 1394) @@ -0,0 +1,27 @@ +find_package ( OpenEXR ) + +if ( OpenEXR_FOUND ) + set ( NAME openimagelib_exr ) + + set ( SOURCES exr_plugin.cpp ) + + add_definitions ( ${OpenEXR_DEFINITIONS} ) + + include_directories ( ${Boost_INCLUDE_DIR} + ${OpenLibraries_SOURCE_DIR}/src + ${OpenEXR_INCLUDE_DIRS}) + + add_library ( ${NAME} SHARED ${SOURCES} ) + + link_directories ( ${OpenLibraries_BINARY_DIR}/src/openpluginlib/pl/ + ${OpenLibraries_BINARY_DIR}/src/openimagelib/il/ ) + + target_link_libraries ( ${NAME} "openpluginlib_pl${LIBRARY_IDENTIFIER}" + "openimagelib_il${LIBRARY_IDENTIFIER}" + ${OpenEXR_LIBRARIES} ) + + install ( TARGETS ${NAME} LIBRARY DESTINATION "lib/${PACKAGE}/openimagelib/plugins/exr/" ) + install ( FILES exr_plugin.opl DESTINATION "lib/${PACKAGE}/openimagelib/plugins/exr/" ) +else ( OpenEXR_FOUND ) + message ( "Can't find libopenexr. Skipping OpenEXR plugin." ) +endif ( OpenEXR_FOUND ) Added: trunk/src/openimagelib/plugins/hdr/CMakeLists.txt =================================================================== --- trunk/src/openimagelib/plugins/hdr/CMakeLists.txt (rev 0) +++ trunk/src/openimagelib/plugins/hdr/CMakeLists.txt 2008-06-20 11:32:55 UTC (rev 1394) @@ -0,0 +1,17 @@ +set ( NAME openimagelib_hdr ) + +set ( SOURCES hdr_plugin.cpp ) + +include_directories ( ${Boost_INCLUDE_DIR}i + ${OpenLibraries_SOURCE_DIR}/src ) + +add_library ( ${NAME} SHARED ${SOURCES} ) + +link_directories ( ${OpenLibraries_BINARY_DIR}/src/openpluginlib/pl/ + ${OpenLibraries_BINARY_DIR}/src/openimagelib/il/ ) + +target_link_libraries ( ${NAME} "openpluginlib_pl${LIBRARY_IDENTIFIER}" + "openimagelib_il${LIBRARY_IDENTIFIER}" ) + +install ( TARGETS ${NAME} LIBRARY DESTINATION "lib/${PACKAGE}/openimagelib/plugins/hdr/" ) +install ( FILES hdr_plugin.opl DESTINATION "lib/${PACKAGE}/openimagelib/plugins/hdr/" ) Added: trunk/src/openimagelib/plugins/png/CMakeLists.txt =================================================================== --- trunk/src/openimagelib/plugins/png/CMakeLists.txt (rev 0) +++ trunk/src/openimagelib/plugins/png/CMakeLists.txt 2008-06-20 11:32:55 UTC (rev 1394) @@ -0,0 +1,21 @@ +find_package ( PNG ) + +set ( NAME openimagelib_png ) + +set ( SOURCES png_plugin.cpp ) + +include_directories ( ${Boost_INCLUDE_DIR} + ${OpenLibraries_SOURCE_DIR}/src + ${PNG_INCLUDE_DIR} ) + +add_library ( ${NAME} SHARED ${SOURCES} ) + +link_directories ( ${OpenLibraries_BINARY_DIR}/src/openpluginlib/pl/ + ${OpenLibraries_BINARY_DIR}/src/openimagelib/il/ ) + +target_link_libraries ( ${NAME} "openpluginlib_pl${LIBRARY_IDENTIFIER}" + "openimagelib_il${LIBRARY_IDENTIFIER}" + ${PNG_LIBRARIES} ) + +install ( TARGETS ${NAME} LIBRARY DESTINATION "lib/${PACKAGE}/openimagelib/plugins/png/" ) +install ( FILES png_plugin.opl DESTINATION "lib/${PACKAGE}/openimagelib/plugins/png/" ) Added: trunk/src/openimagelib/plugins/psd/CMakeLists.txt =================================================================== --- trunk/src/openimagelib/plugins/psd/CMakeLists.txt (rev 0) +++ trunk/src/openimagelib/plugins/psd/CMakeLists.txt 2008-06-20 11:32:55 UTC (rev 1394) @@ -0,0 +1,17 @@ +set ( NAME openimagelib_psd ) + +set ( SOURCES psd_plugin.cpp ) + +include_directories ( ${Boost_INCLUDE_DIR}i + ${OpenLibraries_SOURCE_DIR}/src ) + +add_library ( ${NAME} SHARED ${SOURCES} ) + +link_directories ( ${OpenLibraries_BINARY_DIR}/src/openpluginlib/pl/ + ${OpenLibraries_BINARY_DIR}/src/openimagelib/il/ ) + +target_link_libraries ( ${NAME} "openpluginlib_pl${LIBRARY_IDENTIFIER}" + "openimagelib_il${LIBRARY_IDENTIFIER}" ) + +install ( TARGETS ${NAME} LIBRARY DESTINATION "lib/${PACKAGE}/openimagelib/plugins/psd/" ) +install ( FILES psd_plugin.opl DESTINATION "lib/${PACKAGE}/openimagelib/plugins/psd/" ) Added: trunk/src/openimagelib/plugins/sgi/CMakeLists.txt =================================================================== --- trunk/src/openimagelib/plugins/sgi/CMakeLists.txt (rev 0) +++ trunk/src/openimagelib/plugins/sgi/CMakeLists.txt 2008-06-20 11:32:55 UTC (rev 1394) @@ -0,0 +1,17 @@ +set ( NAME openimagelib_sgi ) + +set ( SOURCES sgi_plugin.cpp ) + +include_directories ( ${Boost_INCLUDE_DIR}i + ${OpenLibraries_SOURCE_DIR}/src ) + +add_library ( ${NAME} SHARED ${SOURCES} ) + +link_directories ( ${OpenLibraries_BINARY_DIR}/src/openpluginlib/pl/ + ${OpenLibraries_BINARY_DIR}/src/openimagelib/il/ ) + +target_link_libraries ( ${NAME} "openpluginlib_pl${LIBRARY_IDENTIFIER}" + "openimagelib_il${LIBRARY_IDENTIFIER}" ) + +install ( TARGETS ${NAME} LIBRARY DESTINATION "lib/${PACKAGE}/openimagelib/plugins/sgi/" ) +install ( FILES sgi_plugin.opl DESTINATION "lib/${PACKAGE}/openimagelib/plugins/sgi/" ) Added: trunk/src/openimagelib/plugins/tga/CMakeLists.txt =================================================================== --- trunk/src/openimagelib/plugins/tga/CMakeLists.txt (rev 0) +++ trunk/src/openimagelib/plugins/tga/CMakeLists.txt 2008-06-20 11:32:55 UTC (rev 1394) @@ -0,0 +1,17 @@ +set ( NAME openimagelib_tga ) + +set ( SOURCES tga_plugin.cpp ) + +include_directories ( ${Boost_INCLUDE_DIR}i + ${OpenLibraries_SOURCE_DIR}/src ) + +add_library ( ${NAME} SHARED ${SOURCES} ) + +link_directories ( ${OpenLibraries_BINARY_DIR}/src/openpluginlib/pl/ + ${OpenLibraries_BINARY_DIR}/src/openimagelib/il/ ) + +target_link_libraries ( ${NAME} "openpluginlib_pl${LIBRARY_IDENTIFIER}" + "openimagelib_il${LIBRARY_IDENTIFIER}" ) + +install ( TARGETS ${NAME} LIBRARY DESTINATION "lib/${PACKAGE}/openimagelib/plugins/tga/" ) +install ( FILES tga_plugin.opl DESTINATION "lib/${PACKAGE}/openimagelib/plugins/tga/" ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <re...@us...> - 2008-06-20 11:35:51
|
Revision: 1395 http://openlibraries.svn.sourceforge.net/openlibraries/?rev=1395&view=rev Author: rexbron Date: 2008-06-20 04:35:38 -0700 (Fri, 20 Jun 2008) Log Message: ----------- Build openeffectslib (seems to only include one plugin) on Linux. Should work on other platforms. Modified Paths: -------------- trunk/src/CMakeLists.txt Added Paths: ----------- trunk/src/openeffectslib/CMakeLists.txt trunk/src/openeffectslib/plugins/CMakeLists.txt trunk/src/openeffectslib/plugins/tonemap/CMakeLists.txt Property Changed: ---------------- trunk/ Property changes on: trunk ___________________________________________________________________ Name: bzr:revision-info - timestamp: 2008-06-20 12:32:24.180000067 +0100 committer: Andrew Hunter <an...@ae...> properties: branch-nick: trunk + timestamp: 2008-06-20 12:35:16.835999966 +0100 committer: Andrew Hunter <an...@ae...> properties: branch-nick: trunk Name: bzr:ancestry:v3-trunk0 - an...@ae...-20080613162705-8emncakb7nkknsbj an...@ae...-20080614133032-vef9lmcgxyrauqss an...@ae...-20080614141409-u4z2pzco7bmhavlb an...@ae...-20080616112610-ky0ylmbwjn9w1mzm an...@ae...-20080616122604-vyn3c4elr33ehlai an...@ae...-20080616222235-pb4vb2oeu6cj88m4 an...@ae...-20080618110236-pfuxsos8x3wd285v an...@ae...-20080618113925-cjg8er4jn4tmc0dm an...@ae...-20080618182841-z2to60sr79wfdq9o an...@ae...-20080618190025-f4tqmfnhagk3glij an...@ae...-20080618195823-74quloizraz2fwj2 an...@ae...-20080619122406-jnh8jzrryfz26k5d an...@ae...-20080619124658-ma0osj6o1ys7khec an...@ae...-20080619134156-uy4fm1k8kygexnbq an...@ae...-20080619134821-m149jig6bmpq41hx an...@ae...-20080619141005-75220r6w2cvqbj8f an...@ae...-20080620064802-8b2g4wfk32dn8mmz + an...@ae...-20080613162705-8emncakb7nkknsbj an...@ae...-20080614133032-vef9lmcgxyrauqss an...@ae...-20080614141409-u4z2pzco7bmhavlb an...@ae...-20080616112610-ky0ylmbwjn9w1mzm an...@ae...-20080616122604-vyn3c4elr33ehlai an...@ae...-20080616222235-pb4vb2oeu6cj88m4 an...@ae...-20080618110236-pfuxsos8x3wd285v an...@ae...-20080618113925-cjg8er4jn4tmc0dm an...@ae...-20080618182841-z2to60sr79wfdq9o an...@ae...-20080618190025-f4tqmfnhagk3glij an...@ae...-20080618195823-74quloizraz2fwj2 an...@ae...-20080619122406-jnh8jzrryfz26k5d an...@ae...-20080619124658-ma0osj6o1ys7khec an...@ae...-20080619134156-uy4fm1k8kygexnbq an...@ae...-20080619134821-m149jig6bmpq41hx an...@ae...-20080619141005-75220r6w2cvqbj8f an...@ae...-20080620064802-8b2g4wfk32dn8mmz an...@ae...-20080620070000-xodqay60ukgg300p Name: bzr:file-ids - src/openimagelib/plugins/bmp/CMakeLists.txt cmakelists.txt-20080620054117-eojq7cb6mkwmdhrt-1 src/openimagelib/plugins/dds/CMakeLists.txt cmakelists.txt-20080620054316-rh0ne5gsqn1wu7x7-1 src/openimagelib/plugins/dpx/CMakeLists.txt cmakelists.txt-20080620053537-iis5yie2yksbjc7s-1 src/openimagelib/plugins/exr/CMakeLists.txt cmakelists.txt-20080620063034-pwotrghy7ty4d9he-1 src/openimagelib/plugins/hdr/CMakeLists.txt cmakelists.txt-20080620063336-38shdw7234ewciiz-1 src/openimagelib/plugins/png/CMakeLists.txt cmakelists.txt-20080620064009-bafahiyohvou2xsb-1 src/openimagelib/plugins/psd/CMakeLists.txt cmakelists.txt-20080620064324-vbvaeoaxtm8km7eg-1 src/openimagelib/plugins/sgi/CMakeLists.txt cmakelists.txt-20080620064519-tohfk8jnqisxmg2u-1 src/openimagelib/plugins/tga/CMakeLists.txt cmakelists.txt-20080620064801-7n6khilt26k2aif8-1 + src/openeffectslib/CMakeLists.txt cmakelists.txt-20080620065821-lx20brr9ray4embr-1 src/openeffectslib/plugins/CMakeLists.txt cmakelists.txt-20080620065821-lx20brr9ray4embr-2 src/openeffectslib/plugins/tonemap/CMakeLists.txt cmakelists.txt-20080620065821-lx20brr9ray4embr-3 Name: bzr:revision-id:v3-trunk0 - 1373 an...@ae...-20080614130206-thshu8ln95djpgng 1374 an...@ae...-20080616113201-cexl9qhreccah10e 1375 an...@ae...-20080616113418-7qu4qxldvpxfrdp7 1376 an...@ae...-20080616113559-u5wad4bpwd9uzmd8 1377 an...@ae...-20080616122853-cwqokea7hkf82eo1 1378 an...@ae...-20080616222400-9q0vwtkk6091txce 1380 an...@ae...-20080618110315-ngg1d48fy0h3b6bs 1381 an...@ae...-20080618114001-2574od4etx4v8p9h 1382 an...@ae...-20080618200208-ysmuaq2p7bfh7km4 1383 an...@ae...-20080618200623-29djr6bh81pmu2mu 1384 an...@ae...-20080618201105-neebgl19i1lbskta 1386 an...@ae...-20080619122646-zgt191pytyx46daj 1387 an...@ae...-20080619134508-jiifnq0kk4kskv4o 1388 an...@ae...-20080619134737-wcqb6ptssduanj6y 1389 an...@ae...-20080619134857-7k2kawpsxgqb9ss6 1390 an...@ae...-20080619141046-tgdq69hsumw4x55z 1391 an...@ae...-20080620113224-d5thhgo782mw0rjo + 1373 an...@ae...-20080614130206-thshu8ln95djpgng 1374 an...@ae...-20080616113201-cexl9qhreccah10e 1375 an...@ae...-20080616113418-7qu4qxldvpxfrdp7 1376 an...@ae...-20080616113559-u5wad4bpwd9uzmd8 1377 an...@ae...-20080616122853-cwqokea7hkf82eo1 1378 an...@ae...-20080616222400-9q0vwtkk6091txce 1380 an...@ae...-20080618110315-ngg1d48fy0h3b6bs 1381 an...@ae...-20080618114001-2574od4etx4v8p9h 1382 an...@ae...-20080618200208-ysmuaq2p7bfh7km4 1383 an...@ae...-20080618200623-29djr6bh81pmu2mu 1384 an...@ae...-20080618201105-neebgl19i1lbskta 1386 an...@ae...-20080619122646-zgt191pytyx46daj 1387 an...@ae...-20080619134508-jiifnq0kk4kskv4o 1388 an...@ae...-20080619134737-wcqb6ptssduanj6y 1389 an...@ae...-20080619134857-7k2kawpsxgqb9ss6 1390 an...@ae...-20080619141046-tgdq69hsumw4x55z 1391 an...@ae...-20080620113224-d5thhgo782mw0rjo 1392 an...@ae...-20080620113516-xdm7bt94xjmnlkme Modified: trunk/src/CMakeLists.txt =================================================================== --- trunk/src/CMakeLists.txt 2008-06-20 11:32:55 UTC (rev 1394) +++ trunk/src/CMakeLists.txt 2008-06-20 11:35:38 UTC (rev 1395) @@ -2,5 +2,5 @@ add_subdirectory( openimagelib ) add_subdirectory( openmedialib ) add_subdirectory( openassetlib ) -#add_subdirectory( openeffectslib ) +add_subdirectory( openeffectslib ) add_subdirectory( openobjectlib ) Added: trunk/src/openeffectslib/CMakeLists.txt =================================================================== --- trunk/src/openeffectslib/CMakeLists.txt (rev 0) +++ trunk/src/openeffectslib/CMakeLists.txt 2008-06-20 11:35:38 UTC (rev 1395) @@ -0,0 +1 @@ +add_subdirectory ( plugins ) Added: trunk/src/openeffectslib/plugins/CMakeLists.txt =================================================================== --- trunk/src/openeffectslib/plugins/CMakeLists.txt (rev 0) +++ trunk/src/openeffectslib/plugins/CMakeLists.txt 2008-06-20 11:35:38 UTC (rev 1395) @@ -0,0 +1 @@ +add_subdirectory ( tonemap ) Added: trunk/src/openeffectslib/plugins/tonemap/CMakeLists.txt =================================================================== --- trunk/src/openeffectslib/plugins/tonemap/CMakeLists.txt (rev 0) +++ trunk/src/openeffectslib/plugins/tonemap/CMakeLists.txt 2008-06-20 11:35:38 UTC (rev 1395) @@ -0,0 +1,23 @@ +find_package ( OpenEXR ) + +set ( NAME openeffectsib_tonemap ) + +set ( SOURCES tonemap_plugin.cpp ) + +include_directories ( ${Boost_INCLUDE_DIR}i + ${OpenLibraries_SOURCE_DIR}/src ) + +add_library ( ${NAME} SHARED ${SOURCES} ) + +link_directories ( ${OpenLibraries_BINARY_DIR}/src/openpluginlib/pl/ + ${OpenLibraries_BINARY_DIR}/src/openimagelib/il/ ) + +target_link_libraries ( ${NAME} "openpluginlib_pl${LIBRARY_IDENTIFIER}" + "openimagelib_il${LIBRARY_IDENTIFIER}" + ${Boost_FILESYSTEM_LIBRARY} + ${OpenEXR_LIBRARIES} ) + +add_definitions ( ${OpenEXR_CFLAGS} ${IlmBase_CFLAGS} ) + +install ( TARGETS ${NAME} LIBRARY DESTINATION "lib/${PACKAGE}/openeffectslib/plugins/tonemap/" ) +install ( FILES tonemap_plugin.opl DESTINATION "lib/${PACKAGE}/openeffectslib/plugins/tonemap/" ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <re...@us...> - 2008-06-20 11:37:01
|
Revision: 1396 http://openlibraries.svn.sourceforge.net/openlibraries/?rev=1396&view=rev Author: rexbron Date: 2008-06-20 04:36:57 -0700 (Fri, 20 Jun 2008) Log Message: ----------- Make make install work. Modified Paths: -------------- trunk/CMakeLists.txt trunk/src/openimagelib/plugins/jpg/CMakeLists.txt Property Changed: ---------------- trunk/ Property changes on: trunk ___________________________________________________________________ Name: bzr:revision-info - timestamp: 2008-06-20 12:35:16.835999966 +0100 committer: Andrew Hunter <an...@ae...> properties: branch-nick: trunk + timestamp: 2008-06-20 12:36:37.913000107 +0100 committer: Andrew Hunter <an...@ae...> properties: branch-nick: trunk Name: bzr:ancestry:v3-trunk0 - an...@ae...-20080613162705-8emncakb7nkknsbj an...@ae...-20080614133032-vef9lmcgxyrauqss an...@ae...-20080614141409-u4z2pzco7bmhavlb an...@ae...-20080616112610-ky0ylmbwjn9w1mzm an...@ae...-20080616122604-vyn3c4elr33ehlai an...@ae...-20080616222235-pb4vb2oeu6cj88m4 an...@ae...-20080618110236-pfuxsos8x3wd285v an...@ae...-20080618113925-cjg8er4jn4tmc0dm an...@ae...-20080618182841-z2to60sr79wfdq9o an...@ae...-20080618190025-f4tqmfnhagk3glij an...@ae...-20080618195823-74quloizraz2fwj2 an...@ae...-20080619122406-jnh8jzrryfz26k5d an...@ae...-20080619124658-ma0osj6o1ys7khec an...@ae...-20080619134156-uy4fm1k8kygexnbq an...@ae...-20080619134821-m149jig6bmpq41hx an...@ae...-20080619141005-75220r6w2cvqbj8f an...@ae...-20080620064802-8b2g4wfk32dn8mmz an...@ae...-20080620070000-xodqay60ukgg300p + an...@ae...-20080613162705-8emncakb7nkknsbj an...@ae...-20080614133032-vef9lmcgxyrauqss an...@ae...-20080614141409-u4z2pzco7bmhavlb an...@ae...-20080616112610-ky0ylmbwjn9w1mzm an...@ae...-20080616122604-vyn3c4elr33ehlai an...@ae...-20080616222235-pb4vb2oeu6cj88m4 an...@ae...-20080618110236-pfuxsos8x3wd285v an...@ae...-20080618113925-cjg8er4jn4tmc0dm an...@ae...-20080618182841-z2to60sr79wfdq9o an...@ae...-20080618190025-f4tqmfnhagk3glij an...@ae...-20080618195823-74quloizraz2fwj2 an...@ae...-20080619122406-jnh8jzrryfz26k5d an...@ae...-20080619124658-ma0osj6o1ys7khec an...@ae...-20080619134156-uy4fm1k8kygexnbq an...@ae...-20080619134821-m149jig6bmpq41hx an...@ae...-20080619141005-75220r6w2cvqbj8f an...@ae...-20080620064802-8b2g4wfk32dn8mmz an...@ae...-20080620070000-xodqay60ukgg300p an...@ae...-20080620074105-20wzobu0xbnadzsc Name: bzr:file-ids - src/openeffectslib/CMakeLists.txt cmakelists.txt-20080620065821-lx20brr9ray4embr-1 src/openeffectslib/plugins/CMakeLists.txt cmakelists.txt-20080620065821-lx20brr9ray4embr-2 src/openeffectslib/plugins/tonemap/CMakeLists.txt cmakelists.txt-20080620065821-lx20brr9ray4embr-3 + Name: bzr:revision-id:v3-trunk0 - 1373 an...@ae...-20080614130206-thshu8ln95djpgng 1374 an...@ae...-20080616113201-cexl9qhreccah10e 1375 an...@ae...-20080616113418-7qu4qxldvpxfrdp7 1376 an...@ae...-20080616113559-u5wad4bpwd9uzmd8 1377 an...@ae...-20080616122853-cwqokea7hkf82eo1 1378 an...@ae...-20080616222400-9q0vwtkk6091txce 1380 an...@ae...-20080618110315-ngg1d48fy0h3b6bs 1381 an...@ae...-20080618114001-2574od4etx4v8p9h 1382 an...@ae...-20080618200208-ysmuaq2p7bfh7km4 1383 an...@ae...-20080618200623-29djr6bh81pmu2mu 1384 an...@ae...-20080618201105-neebgl19i1lbskta 1386 an...@ae...-20080619122646-zgt191pytyx46daj 1387 an...@ae...-20080619134508-jiifnq0kk4kskv4o 1388 an...@ae...-20080619134737-wcqb6ptssduanj6y 1389 an...@ae...-20080619134857-7k2kawpsxgqb9ss6 1390 an...@ae...-20080619141046-tgdq69hsumw4x55z 1391 an...@ae...-20080620113224-d5thhgo782mw0rjo 1392 an...@ae...-20080620113516-xdm7bt94xjmnlkme + 1373 an...@ae...-20080614130206-thshu8ln95djpgng 1374 an...@ae...-20080616113201-cexl9qhreccah10e 1375 an...@ae...-20080616113418-7qu4qxldvpxfrdp7 1376 an...@ae...-20080616113559-u5wad4bpwd9uzmd8 1377 an...@ae...-20080616122853-cwqokea7hkf82eo1 1378 an...@ae...-20080616222400-9q0vwtkk6091txce 1380 an...@ae...-20080618110315-ngg1d48fy0h3b6bs 1381 an...@ae...-20080618114001-2574od4etx4v8p9h 1382 an...@ae...-20080618200208-ysmuaq2p7bfh7km4 1383 an...@ae...-20080618200623-29djr6bh81pmu2mu 1384 an...@ae...-20080618201105-neebgl19i1lbskta 1386 an...@ae...-20080619122646-zgt191pytyx46daj 1387 an...@ae...-20080619134508-jiifnq0kk4kskv4o 1388 an...@ae...-20080619134737-wcqb6ptssduanj6y 1389 an...@ae...-20080619134857-7k2kawpsxgqb9ss6 1390 an...@ae...-20080619141046-tgdq69hsumw4x55z 1391 an...@ae...-20080620113224-d5thhgo782mw0rjo 1392 an...@ae...-20080620113516-xdm7bt94xjmnlkme 1393 an...@ae...-20080620113637-naxle4ehjs3kcwdf Modified: trunk/CMakeLists.txt =================================================================== --- trunk/CMakeLists.txt 2008-06-20 11:35:38 UTC (rev 1395) +++ trunk/CMakeLists.txt 2008-06-20 11:36:57 UTC (rev 1396) @@ -95,4 +95,9 @@ option ( WITH_PYTHON_EXTENTIONS "Compile the python extentions for OpenLibraries." TRUE ) option ( WITH_OPENFX_PLUGIN "Compile the OpenFX plugin for openmedialib." FALSE ) +# Install .so files with execcuteable permissions +if ( not win32 ) + set ( CMAKE_INSTALL_SO_NO_EXE FALSE ) +endif ( not win32 ) + add_subdirectory( src ) Modified: trunk/src/openimagelib/plugins/jpg/CMakeLists.txt =================================================================== --- trunk/src/openimagelib/plugins/jpg/CMakeLists.txt 2008-06-20 11:35:38 UTC (rev 1395) +++ trunk/src/openimagelib/plugins/jpg/CMakeLists.txt 2008-06-20 11:36:57 UTC (rev 1396) @@ -11,7 +11,7 @@ INCLUDE_DIRECTORIES ( ${JPEG_INCLUDE_DIR} ) LINK_DIRECTORIES ( ${JPEG_LIBRAIES} ${OpenLibraries_BINARY_DIR}/src/openpluginlib/pl ${OpenLibraries_BINARY_DIR}/src/openimagelib/il/) TARGET_LINK_LIBRARIES ( ${NAME} ${JPEG_LIBRAIES} "openpluginlib_pl${LIBRARY_IDENTIFIER}" "openimagelib_il${LIBRARY_IDENTIFIER}" ) - INSTALL ( FILES jpg_plugins.opl DESTINATION "lib/${PACKAGE}/openimagelib/plugins/" ) + INSTALL ( FILES jpg_plugin.opl DESTINATION "lib/${PACKAGE}/openimagelib/plugins/" ) INSTALL( TARGETS ${NAME} DESTINATION "lib/${PACKAGE}/openimagelib/plugins" ) ELSE ( JPEG_FOUND ) MESSAGE ( "libJPEG not found, skipping jpg plugin." ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tim...@us...> - 2008-06-24 17:17:55
|
Revision: 1399 http://openlibraries.svn.sourceforge.net/openlibraries/?rev=1399&view=rev Author: timdewhirst Date: 2008-06-24 10:17:13 -0700 (Tue, 24 Jun 2008) Log Message: ----------- CMake - report if a plugin is not going to be built - add some information to INSTALL, NEWS - whitespace cleanup Modified Paths: -------------- trunk/FindFFMPEG.cmake trunk/INSTALL trunk/NEWS trunk/src/openmedialib/plugins/avformat/CMakeLists.txt trunk/src/openmedialib/plugins/openal/CMakeLists.txt trunk/src/openmedialib/plugins/sdl/CMakeLists.txt Modified: trunk/FindFFMPEG.cmake =================================================================== --- trunk/FindFFMPEG.cmake 2008-06-23 10:14:08 UTC (rev 1398) +++ trunk/FindFFMPEG.cmake 2008-06-24 17:17:13 UTC (rev 1399) @@ -81,7 +81,7 @@ ENDIF ( AVFORMAT_INCLUDE_DIR AND AVFORMAT_LIBRARY ) IF ( AVCODEC_INCLUDE_DIR AND AVCODEC_LIBRARY ) - SET ( AVCODEC_FOUND TRUE) + SET ( AVCODEC_FOUND TRUE ) ENDIF ( AVCODEC_INCLUDE_DIR AND AVCODEC_LIBRARY ) IF ( AVUTIL_INCLUDE_DIR AND AVUTIL_LIBRARY ) Modified: trunk/INSTALL =================================================================== --- trunk/INSTALL 2008-06-23 10:14:08 UTC (rev 1398) +++ trunk/INSTALL 2008-06-24 17:17:13 UTC (rev 1399) @@ -1,8 +1,8 @@ Installation Instructions ************************* -Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free -Software Foundation, Inc. +Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, +2006, 20007, 2008 Free Software Foundation, Inc. This file is free documentation; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. @@ -10,227 +10,17 @@ Basic Installation ================== -These are generic installation instructions. +The proposed standard build and installation method will be using cmake; +cmake is a cross-platform build system available from http://www.cmake.org. +CMake 2.6 is required. - The `configure' shell script attempts to guess correct values for -various system-dependent variables used during compilation. It uses -those values to create a `Makefile' in each directory of the package. -It may also create one or more `.h' files containing system-dependent -definitions. Finally, it creates a shell script `config.status' that -you can run in the future to recreate the current configuration, and a -file `config.log' containing compiler output (useful mainly for -debugging `configure'). +Windows +------- - It can also use an optional file (typically called `config.cache' -and enabled with `--cache-file=config.cache' or simply `-C') that saves -the results of its tests to speed up reconfiguring. (Caching is -disabled by default to prevent problems with accidental use of stale -cache files.) - - If you need to do unusual things to compile the package, please try -to figure out how `configure' could check whether to do them, and mail -diffs or instructions to the address given in the `README' so they can -be considered for the next release. If you are using the cache, and at -some point `config.cache' contains results you don't want to keep, you -may remove or edit it. - - The file `configure.ac' (or `configure.in') is used to create -`configure' by a program called `autoconf'. You only need -`configure.ac' if you want to change it or regenerate `configure' using -a newer version of `autoconf'. - -The simplest way to compile this package is: - - 1. `cd' to the directory containing the package's source code and type - `./configure' to configure the package for your system. If you're - using `csh' on an old version of System V, you might need to type - `sh ./configure' instead to prevent `csh' from trying to execute - `configure' itself. - - Running `configure' takes awhile. While running, it prints some - messages telling which features it is checking for. - - 2. Type `make' to compile the package. - - 3. Optionally, type `make check' to run any self-tests that come with - the package. - - 4. Type `make install' to install the programs and any data files and - documentation. - - 5. You can remove the program binaries and object files from the - source code directory by typing `make clean'. To also remove the - files that `configure' created (so you can compile the package for - a different kind of computer), type `make distclean'. There is - also a `make maintainer-clean' target, but that is intended mainly - for the package's developers. If you use it, you may have to get - all sorts of other programs in order to regenerate files that came - with the distribution. - -Compilers and Options -===================== - -Some systems require unusual options for compilation or linking that the -`configure' script does not know about. Run `./configure --help' for -details on some of the pertinent environment variables. - - You can give `configure' initial values for configuration parameters -by setting variables in the command line or in the environment. Here -is an example: - - ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix - - *Note Defining Variables::, for more details. - -Compiling For Multiple Architectures -==================================== - -You can compile the package for more than one kind of computer at the -same time, by placing the object files for each architecture in their -own directory. To do this, you must use a version of `make' that -supports the `VPATH' variable, such as GNU `make'. `cd' to the -directory where you want the object files and executables to go and run -the `configure' script. `configure' automatically checks for the -source code in the directory that `configure' is in and in `..'. - - If you have to use a `make' that does not support the `VPATH' -variable, you have to compile the package for one architecture at a -time in the source code directory. After you have installed the -package for one architecture, use `make distclean' before reconfiguring -for another architecture. - -Installation Names -================== - -By default, `make install' will install the package's files in -`/usr/local/bin', `/usr/local/man', etc. You can specify an -installation prefix other than `/usr/local' by giving `configure' the -option `--prefix=PREFIX'. - - You can specify separate installation prefixes for -architecture-specific files and architecture-independent files. If you -give `configure' the option `--exec-prefix=PREFIX', the package will -use PREFIX as the prefix for installing programs and libraries. -Documentation and other data files will still use the regular prefix. - - In addition, if you use an unusual directory layout you can give -options like `--bindir=DIR' to specify different values for particular -kinds of files. Run `configure --help' for a list of the directories -you can set and what kinds of files go in them. - - If the package supports it, you can cause programs to be installed -with an extra prefix or suffix on their names by giving `configure' the -option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. - -Optional Features -================= - -Some packages pay attention to `--enable-FEATURE' options to -`configure', where FEATURE indicates an optional part of the package. -They may also pay attention to `--with-PACKAGE' options, where PACKAGE -is something like `gnu-as' or `x' (for the X Window System). The -`README' should mention any `--enable-' and `--with-' options that the -package recognizes. - - For packages that use the X Window System, `configure' can usually -find the X include and library files automatically, but if it doesn't, -you can use the `configure' options `--x-includes=DIR' and -`--x-libraries=DIR' to specify their locations. - -Specifying the System Type -========================== - -There may be some features `configure' cannot figure out automatically, -but needs to determine by the type of machine the package will run on. -Usually, assuming the package is built to be run on the _same_ -architectures, `configure' can figure that out, but if it prints a -message saying it cannot guess the machine type, give it the -`--build=TYPE' option. TYPE can either be a short name for the system -type, such as `sun4', or a canonical name which has the form: - - CPU-COMPANY-SYSTEM - -where SYSTEM can have one of these forms: - - OS KERNEL-OS - - See the file `config.sub' for the possible values of each field. If -`config.sub' isn't included in this package, then this package doesn't -need to know the machine type. - - If you are _building_ compiler tools for cross-compiling, you should -use the `--target=TYPE' option to select the type of system they will -produce code for. - - If you want to _use_ a cross compiler, that generates code for a -platform different from the build platform, you should specify the -"host" platform (i.e., that on which the generated programs will -eventually be run) with `--host=TYPE'. - -Sharing Defaults -================ - -If you want to set default values for `configure' scripts to share, you -can create a site shell script called `config.site' that gives default -values for variables like `CC', `cache_file', and `prefix'. -`configure' looks for `PREFIX/share/config.site' if it exists, then -`PREFIX/etc/config.site' if it exists. Or, you can set the -`CONFIG_SITE' environment variable to the location of the site script. -A warning: not all `configure' scripts look for a site script. - -Defining Variables -================== - -Variables not defined in a site shell script can be set in the -environment passed to `configure'. However, some packages may run -configure again during the build, and the customized values of these -variables may be lost. In order to avoid this problem, you should set -them in the `configure' command line, using `VAR=value'. For example: - - ./configure CC=/usr/local2/bin/gcc - -causes the specified `gcc' to be used as the C compiler (unless it is -overridden in the site shell script). Here is a another example: - - /bin/bash ./configure CONFIG_SHELL=/bin/bash - -Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent -configuration-related scripts to be executed by `/bin/bash'. - -`configure' Invocation -====================== - -`configure' recognizes the following options to control how it operates. - -`--help' -`-h' - Print a summary of the options to `configure', and exit. - -`--version' -`-V' - Print the version of Autoconf used to generate the `configure' - script, and exit. - -`--cache-file=FILE' - Enable the cache: use and save the results of the tests in FILE, - traditionally `config.cache'. FILE defaults to `/dev/null' to - disable caching. - -`--config-cache' -`-C' - Alias for `--cache-file=config.cache'. - -`--quiet' -`--silent' -`-q' - Do not print messages saying which checks are being made. To - suppress all normal output, redirect it to `/dev/null' (any error - messages will still be shown). - -`--srcdir=DIR' - Look for the package's source code in directory DIR. Usually - `configure' can determine that directory automatically. - -`configure' also accepts some other, not widely useful, options. Run -`configure --help' for more details. - + * create a build directory from within the desired branch e.g. trunk + * cd build + * run cmake: cmake .. + * some environmental variables that should be set: + * OPENALDIR: points to location of the OpenAL directory + * SDLDIR: points to the location of the SDL directory + * FFMPEGDIR: points to the location of the FFMPEG directory Modified: trunk/NEWS =================================================================== --- trunk/NEWS 2008-06-23 10:14:08 UTC (rev 1398) +++ trunk/NEWS 2008-06-24 17:17:13 UTC (rev 1399) @@ -0,0 +1,4 @@ +NEWS +==== + +[24/06/2008]: added note on cmake usage to INSTALL Modified: trunk/src/openmedialib/plugins/avformat/CMakeLists.txt =================================================================== --- trunk/src/openmedialib/plugins/avformat/CMakeLists.txt 2008-06-23 10:14:08 UTC (rev 1398) +++ trunk/src/openmedialib/plugins/avformat/CMakeLists.txt 2008-06-24 17:17:13 UTC (rev 1399) @@ -1,45 +1,48 @@ -include_directories( ${OpenLibraries_SOURCE_DIR}/src ) -set( NAME openmedialib_avformat ) - -if( WIN32 ) - add_definitions( -DML_PLUGIN_EXPORTS ) - add_definitions( -DOPENIMAGELIB_LIBNAME=\\\"${NAME}\\\" ) - add_definitions( -DOPENIMAGELIB_VERSION=\\\"${VERSION_STRING}\\\" ) - add_definitions( -DOPENIMAGELIB_BUILD ) - set( NAME "${NAME}${LIBRARY_IDENTIFIER}" ) -endif( WIN32 ) - -set( SOURCES - avformat_plugin.cpp ) - -install( - FILES - avformat_plugin.opl - DESTINATION "lib/${PACKAGE}/openmedialib/plugins" ) - -add_library( ${NAME} SHARED ${SOURCES} ) -install( TARGETS ${NAME} - RUNTIME DESTINATION "lib/${PACKAGE}/openmedialib/plugins" - LIBRARY DESTINATION "lib/${PACKAGE}/openmedialib/plugins" ) - find_package( FFMPEG REQUIRED ) if( FFMPEG_FOUND ) message( "found FFMPEG: ${FFMPEG_INCLUDE_DIR} ${FFMPEG_LIBRARY_DIR}" ) include_directories( ${FFMPEG_INCLUDE_DIR} ) + include_directories( ${OpenLibraries_SOURCE_DIR}/src ) + target_link_libraries( ${NAME} ${FFMPEG_LIBRARIES} ) -endif( FFMPEG_FOUND ) -# kill some warnings -if ( WIN32 ) - set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4244" ) -endif( WIN32 ) + set( NAME openmedialib_avformat ) -# required links -link_directories( ${OpenLibraries_BINARY_DIR}/src/openpluginlib/pl - ${OpenLibraries_BINARY_DIR}/src/openimagelib/il - ${openmedialib_ml_BINARY_DIR} ) -target_link_libraries( ${NAME} "openpluginlib_pl${LIBRARY_IDENTIFIER}" - "openimagelib_il${LIBRARY_IDENTIFIER}" - "openmedialib_ml${LIBRARY_IDENTIFIER}" - ${Boost_FILESYSTEM_LIBRARY} ) + if( WIN32 ) + add_definitions( -DML_PLUGIN_EXPORTS ) + add_definitions( -DOPENIMAGELIB_LIBNAME=\\\"${NAME}\\\" ) + add_definitions( -DOPENIMAGELIB_VERSION=\\\"${VERSION_STRING}\\\" ) + add_definitions( -DOPENIMAGELIB_BUILD ) + set( NAME "${NAME}${LIBRARY_IDENTIFIER}" ) + endif( WIN32 ) + + set( SOURCES + avformat_plugin.cpp ) + + install( + FILES + avformat_plugin.opl + DESTINATION "lib/${PACKAGE}/openmedialib/plugins" ) + + add_library( ${NAME} SHARED ${SOURCES} ) + install( TARGETS ${NAME} + RUNTIME DESTINATION "lib/${PACKAGE}/openmedialib/plugins" + LIBRARY DESTINATION "lib/${PACKAGE}/openmedialib/plugins" ) + + # kill some warnings + if ( WIN32 ) + set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4244" ) + endif( WIN32 ) + + # required links + link_directories( ${OpenLibraries_BINARY_DIR}/src/openpluginlib/pl + ${OpenLibraries_BINARY_DIR}/src/openimagelib/il + ${openmedialib_ml_BINARY_DIR} ) + target_link_libraries( ${NAME} "openpluginlib_pl${LIBRARY_IDENTIFIER}" + "openimagelib_il${LIBRARY_IDENTIFIER}" + "openmedialib_ml${LIBRARY_IDENTIFIER}" + ${Boost_FILESYSTEM_LIBRARY} ) +else ( FFMPEG_FOUND ) + message( "failed to find FFMPEG: try setting FFMPEGDIR" ) +endif( FFMPEG_FOUND ) Modified: trunk/src/openmedialib/plugins/openal/CMakeLists.txt =================================================================== --- trunk/src/openmedialib/plugins/openal/CMakeLists.txt 2008-06-23 10:14:08 UTC (rev 1398) +++ trunk/src/openmedialib/plugins/openal/CMakeLists.txt 2008-06-24 17:17:13 UTC (rev 1399) @@ -1,40 +1,44 @@ -include_directories( ${OpenLibraries_SOURCE_DIR}/src ) -set( NAME openmedialib_openal ) +# OpenAL +find_package( OpenAL ) +if ( OPENAL_FOUND ) + message( "found OpenAL: ${OPENAL_INCLUDE_DIR}" ) -if( WIN32 ) - add_definitions( -DML_PLUGIN_EXPORTS ) - add_definitions( -DOPENIMAGELIB_LIBNAME=\\\"${NAME}\\\" ) - add_definitions( -DOPENIMAGELIB_VERSION=\\\"${VERSION_STRING}\\\" ) - add_definitions( -DOPENIMAGELIB_BUILD ) - set( NAME "${NAME}${LIBRARY_IDENTIFIER}" ) -endif( WIN32 ) + include_directories( ${OpenLibraries_SOURCE_DIR}/src ) + include_directories( ${OPENAL_INCLUDE_DIR} ) + set( NAME openmedialib_openal ) -set( SOURCES - openal_plugin.cpp ) + if( WIN32 ) + add_definitions( -DML_PLUGIN_EXPORTS ) + add_definitions( -DOPENIMAGELIB_LIBNAME=\\\"${NAME}\\\" ) + add_definitions( -DOPENIMAGELIB_VERSION=\\\"${VERSION_STRING}\\\" ) + add_definitions( -DOPENIMAGELIB_BUILD ) + set( NAME "${NAME}${LIBRARY_IDENTIFIER}" ) + endif( WIN32 ) -install( - FILES - openal_plugin.opl - DESTINATION "lib/${PACKAGE}/openmedialib/plugins" ) + set( SOURCES + openal_plugin.cpp ) -add_library( ${NAME} SHARED ${SOURCES} ) -install( TARGETS ${NAME} - RUNTIME DESTINATION "lib/${PACKAGE}/openmedialib/plugins" - LIBRARY DESTINATION "lib/${PACKAGE}/openmedialib/plugins" ) + install( + FILES + openal_plugin.opl + DESTINATION "lib/${PACKAGE}/openmedialib/plugins" ) -# OpenAL -find_package( OpenAL ) -if ( OPENAL_FOUND ) - message( "found OpenAL: ${OPENAL_INCLUDE_DIR}" ) - include_directories( ${OPENAL_INCLUDE_DIR} ) + add_library( ${NAME} SHARED ${SOURCES} ) + install( TARGETS ${NAME} + RUNTIME DESTINATION "lib/${PACKAGE}/openmedialib/plugins" + LIBRARY DESTINATION "lib/${PACKAGE}/openmedialib/plugins" ) + + + # required links + link_directories( ${OpenLibraries_BINARY_DIR}/src/openpluginlib/pl + ${OpenLibraries_BINARY_DIR}/src/openimagelib/il + ${openmedialib_ml_BINARY_DIR} ) + target_link_libraries( ${NAME} "openpluginlib_pl${LIBRARY_IDENTIFIER}" ) + target_link_libraries( ${NAME} "openimagelib_il${LIBRARY_IDENTIFIER}" ) + target_link_libraries( ${NAME} "openmedialib_ml${LIBRARY_IDENTIFIER}" ) + target_link_libraries( ${NAME} ${OPENAL_LIBRARY} ) + +else ( OPENAL_FOUND ) + message( "failed to find OpenAL: check variable OPENALDIR" ) endif ( OPENAL_FOUND ) - -# required links -link_directories( ${OpenLibraries_BINARY_DIR}/src/openpluginlib/pl - ${OpenLibraries_BINARY_DIR}/src/openimagelib/il - ${openmedialib_ml_BINARY_DIR} ) -target_link_libraries( ${NAME} "openpluginlib_pl${LIBRARY_IDENTIFIER}" ) -target_link_libraries( ${NAME} "openimagelib_il${LIBRARY_IDENTIFIER}" ) -target_link_libraries( ${NAME} "openmedialib_ml${LIBRARY_IDENTIFIER}" ) -target_link_libraries( ${NAME} ${OPENAL_LIBRARY} ) Modified: trunk/src/openmedialib/plugins/sdl/CMakeLists.txt =================================================================== --- trunk/src/openmedialib/plugins/sdl/CMakeLists.txt 2008-06-23 10:14:08 UTC (rev 1398) +++ trunk/src/openmedialib/plugins/sdl/CMakeLists.txt 2008-06-24 17:17:13 UTC (rev 1399) @@ -1,40 +1,43 @@ -include_directories( ${OpenLibraries_SOURCE_DIR}/src ) -set( NAME openmedialib_sdl ) +# SDL +find_package( SDL ) +if ( SDL_FOUND ) + message( "found SDL: ${SDL_INCLUDE_DIR}" ) + include_directories( ${SDL_INCLUDE_DIR} ) + include_directories( ${OpenLibraries_SOURCE_DIR}/src ) + set( NAME openmedialib_sdl ) -if( WIN32 ) - add_definitions( -DML_PLUGIN_EXPORTS ) - add_definitions( -DOPENIMAGELIB_LIBNAME=\\\"${NAME}\\\" ) - add_definitions( -DOPENIMAGELIB_VERSION=\\\"${VERSION_STRING}\\\" ) - add_definitions( -DOPENIMAGELIB_BUILD ) - set( NAME "${NAME}${LIBRARY_IDENTIFIER}" ) -endif( WIN32 ) + if( WIN32 ) + add_definitions( -DML_PLUGIN_EXPORTS ) + add_definitions( -DOPENIMAGELIB_LIBNAME=\\\"${NAME}\\\" ) + add_definitions( -DOPENIMAGELIB_VERSION=\\\"${VERSION_STRING}\\\" ) + add_definitions( -DOPENIMAGELIB_BUILD ) + set( NAME "${NAME}${LIBRARY_IDENTIFIER}" ) + endif( WIN32 ) -set( SOURCES - sdl_plugin.cpp ) + set( SOURCES + sdl_plugin.cpp ) -install( - FILES - sdl_plugin.opl - DESTINATION "lib/${PACKAGE}/openmedialib/plugins" ) + install( + FILES + sdl_plugin.opl + DESTINATION "lib/${PACKAGE}/openmedialib/plugins" ) -add_library( ${NAME} SHARED ${SOURCES} ) -install( TARGETS ${NAME} - RUNTIME DESTINATION "lib/${PACKAGE}/openmedialib/plugins" - LIBRARY DESTINATION "lib/${PACKAGE}/openmedialib/plugins" ) + add_library( ${NAME} SHARED ${SOURCES} ) + install( TARGETS ${NAME} + RUNTIME DESTINATION "lib/${PACKAGE}/openmedialib/plugins" + LIBRARY DESTINATION "lib/${PACKAGE}/openmedialib/plugins" ) -# SDL -find_package( SDL ) -if ( SDL_FOUND ) - message( "found SDL: ${SDL_INCLUDE_DIR}" ) - include_directories( ${SDL_INCLUDE_DIR} ) + + # required links + link_directories( ${OpenLibraries_BINARY_DIR}/src/openpluginlib/pl + ${OpenLibraries_BINARY_DIR}/src/openimagelib/il + ${openmedialib_ml_BINARY_DIR} ) + target_link_libraries( ${NAME} "openpluginlib_pl${LIBRARY_IDENTIFIER}" ) + target_link_libraries( ${NAME} "openimagelib_il${LIBRARY_IDENTIFIER}" ) + target_link_libraries( ${NAME} "openmedialib_ml${LIBRARY_IDENTIFIER}" ) + target_link_libraries( ${NAME} ${SDL_LIBRARY} ) + +else ( SDL_FOUND ) + message( "failed to find SDL: try setting SDLDIR" ) endif ( SDL_FOUND ) - -# required links -link_directories( ${OpenLibraries_BINARY_DIR}/src/openpluginlib/pl - ${OpenLibraries_BINARY_DIR}/src/openimagelib/il - ${openmedialib_ml_BINARY_DIR} ) -target_link_libraries( ${NAME} "openpluginlib_pl${LIBRARY_IDENTIFIER}" ) -target_link_libraries( ${NAME} "openimagelib_il${LIBRARY_IDENTIFIER}" ) -target_link_libraries( ${NAME} "openmedialib_ml${LIBRARY_IDENTIFIER}" ) -target_link_libraries( ${NAME} ${SDL_LIBRARY} ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tim...@us...> - 2008-06-25 10:11:34
|
Revision: 1400 http://openlibraries.svn.sourceforge.net/openlibraries/?rev=1400&view=rev Author: timdewhirst Date: 2008-06-25 03:11:17 -0700 (Wed, 25 Jun 2008) Log Message: ----------- CMake - more fixes to cmake building on windows; this now will generate a build of olibs with FFMPEG, OpenAL and SDL Modified Paths: -------------- trunk/FindFFMPEG.cmake trunk/src/openassetlib/al/CMakeLists.txt trunk/src/openeffectslib/plugins/tonemap/CMakeLists.txt trunk/src/openimagelib/il/CMakeLists.txt trunk/src/openmedialib/ml/CMakeLists.txt trunk/src/openmedialib/plugins/avformat/CMakeLists.txt trunk/src/openobjectlib/sg/CMakeLists.txt trunk/src/openpluginlib/pl/CMakeLists.txt Modified: trunk/FindFFMPEG.cmake =================================================================== --- trunk/FindFFMPEG.cmake 2008-06-24 17:17:13 UTC (rev 1399) +++ trunk/FindFFMPEG.cmake 2008-06-25 10:11:17 UTC (rev 1400) @@ -15,11 +15,6 @@ FIND_PATH( FFMPEG_LIBRARY_DIR ${FFMPEG_LIBRARIES} PATHS $ENV{FFMPEGDIR}/lib ) else( WIN32 ) - #SET( FFMPEG_LIBRARIES avformat.* avcodec.* avutil.* avdevice.* swscale.* ) - #FIND_PATH( FFMPEG_INCLUDE_DIR ${FFMPEG_HEADERS} - # PATHS /usr/local/include/ffmpeg /usr/include/ffmpeg ) - #FIND_PATH( FFMPEG_LIBRARY_DIR ${FFMPEG_LIBRARIES} - # PATHS /usr/lib /usr/local/lib ) #FindAvformat FIND_PATH( AVFORMAT_INCLUDE_DIR avformat.h PATHS /usr/include/ @@ -98,20 +93,11 @@ IF ( WIN32 ) - IF (FFMPEG_INCLUDE_DIR AND FFMPEG_LIBRARY_DIR) - SET(FFMPEG_FOUND TRUE) - FOREACH( l ${FFMPEG_LIBRARIES} ) - SET( TMP ${TMP} ${FFMPEG_LIBRARY_DIR}/${l} ) - ENDFOREACH( l ) - SET( FFMPEG_LIBRARIES ${TMP} ) - ELSE (FFMPEG_INCLUDE_DIR AND FFMPEG_LIBRARY_DIR) - SET( FFMPEG_FOUND FALSE ) - SET( FFMPEG_LIBRARY_DIR ) - ENDIF (FFMPEG_INCLUDE_DIR AND FFMPEG_LIBRARY_DIR) + IF ( FFMPEG_INCLUDE_DIR AND FFMPEG_LIBRARY_DIR ) + SET( FFMPEG_FOUND TRUE ) + ENDIF ( FFMPEG_INCLUDE_DIR AND FFMPEG_LIBRARY_DIR ) ELSE ( WIN32 ) - IF ( AVFORMAT_INCLUDE_DIR OR AVCODEC_INCLUDE_DIR OR AVUTIL_INCLUDE_DIR OR AVDEVICE_FOUND OR SWSCALE_FOUND ) - SET ( FFMPEG_FOUND TRUE ) SET ( FFMPEG_INCLUDE_DIR @@ -127,12 +113,6 @@ ${AVUTIL_LIBRARY} ${AVDEVICE_LIBRARY} ${SWSCALE_LIBRARY} ) - ENDIF ( AVFORMAT_INCLUDE_DIR OR AVCODEC_INCLUDE_DIR OR AVUTIL_INCLUDE_DIR OR AVDEVICE_FOUND OR SWSCALE_FOUND ) - ENDIF ( WIN32 ) -MARK_AS_ADVANCED( - FFMPEG_LIBRARY_DIR - FFMPEG_INCLUDE_DIR -) Modified: trunk/src/openassetlib/al/CMakeLists.txt =================================================================== --- trunk/src/openassetlib/al/CMakeLists.txt 2008-06-24 17:17:13 UTC (rev 1399) +++ trunk/src/openassetlib/al/CMakeLists.txt 2008-06-25 10:11:17 UTC (rev 1400) @@ -2,8 +2,8 @@ include_directories( ${OpenLibraries_SOURCE_DIR}/src ) set( NAME openassetlib_al ) +add_definitions( -DAL_EXPORTS ) if( WIN32 ) - add_definitions( -DAL_EXPORTS ) add_definitions( -DOPENASSETLIB_LIBNAME=\\\"${NAME}\\\" ) add_definitions( -DOPENASSETLIB_VERSION=\\\"${VERSION_STRING}\\\" ) add_definitions( -DOPENASSETLIB_BUILD ) Modified: trunk/src/openeffectslib/plugins/tonemap/CMakeLists.txt =================================================================== --- trunk/src/openeffectslib/plugins/tonemap/CMakeLists.txt 2008-06-24 17:17:13 UTC (rev 1399) +++ trunk/src/openeffectslib/plugins/tonemap/CMakeLists.txt 2008-06-25 10:11:17 UTC (rev 1400) @@ -1,26 +1,31 @@ -find_package ( OpenEXR ) -set ( NAME openeffectsib_tonemap ) +set ( NAME openeffectslib_tonemap ) -set ( SOURCES tonemap_plugin.cpp ) +find_package ( OpenEXR ) +if ( OPENEXR_FOUND ) + add_definitions( -DML_EXPORTS ) + set ( SOURCES tonemap_plugin.cpp ) -include_directories ( ${Boost_INCLUDE_DIR}i - ${OpenLibraries_SOURCE_DIR}/src ) + include_directories ( ${Boost_INCLUDE_DIR}i + ${OpenLibraries_SOURCE_DIR}/src ) -add_library ( ${NAME} SHARED ${SOURCES} ) + add_library ( ${NAME} SHARED ${SOURCES} ) -link_directories ( ${OpenLibraries_BINARY_DIR}/src/openpluginlib/pl/ - ${OpenLibraries_BINARY_DIR}/src/openimagelib/il/ ) + link_directories ( ${OpenLibraries_BINARY_DIR}/src/openpluginlib/pl/ + ${OpenLibraries_BINARY_DIR}/src/openimagelib/il/ ) -target_link_libraries ( ${NAME} "openpluginlib_pl${LIBRARY_IDENTIFIER}" - "openimagelib_il${LIBRARY_IDENTIFIER}" - ${Boost_FILESYSTEM_LIBRARY} - ${OpenEXR_LIBRARIES} ) + target_link_libraries ( ${NAME} "openpluginlib_pl${LIBRARY_IDENTIFIER}" + "openimagelib_il${LIBRARY_IDENTIFIER}" + ${Boost_FILESYSTEM_LIBRARY} + ${OpenEXR_LIBRARIES} ) -add_definitions ( ${OpenEXR_CFLAGS} ${IlmBase_CFLAGS} ) + add_definitions ( ${OpenEXR_CFLAGS} ${IlmBase_CFLAGS} ) -install ( TARGETS ${NAME} - ARCHIVE DESTINATION "lib/${PACKAGE}/openeffectslib/plugins/tonemap/" - RUNTIME DESTINATION "lib/${PACKAGE}/openeffectslib/plugins/tonemap/" - LIBRARY DESTINATION "lib/${PACKAGE}/openeffectslib/plugins/tonemap/" ) -install ( FILES tonemap_plugin.opl DESTINATION "lib/${PACKAGE}/openeffectslib/plugins/tonemap/" ) + install ( TARGETS ${NAME} + ARCHIVE DESTINATION "lib/${PACKAGE}/openeffectslib/plugins/tonemap/" + RUNTIME DESTINATION "lib/${PACKAGE}/openeffectslib/plugins/tonemap/" + LIBRARY DESTINATION "lib/${PACKAGE}/openeffectslib/plugins/tonemap/" ) + install ( FILES tonemap_plugin.opl DESTINATION "lib/${PACKAGE}/openeffectslib/plugins/tonemap/" ) +else ( OPENEXR_FOUND ) + message( "failed to find openEXR; unable to build ${NAME}" ) +endif ( OPENEXR_FOUND ) Modified: trunk/src/openimagelib/il/CMakeLists.txt =================================================================== --- trunk/src/openimagelib/il/CMakeLists.txt 2008-06-24 17:17:13 UTC (rev 1399) +++ trunk/src/openimagelib/il/CMakeLists.txt 2008-06-25 10:11:17 UTC (rev 1400) @@ -2,8 +2,8 @@ include_directories( ${OpenLibraries_SOURCE_DIR}/src ) set( NAME openimagelib_il ) +add_definitions( -DIL_EXPORTS ) if( WIN32 ) - add_definitions( -DIL_EXPORTS ) add_definitions( -DOPENIMAGELIB_LIBNAME=\\\"${NAME}\\\" ) add_definitions( -DOPENIMAGELIB_VERSION=\\\"${VERSION_STRING}\\\" ) add_definitions( -DOPENIMAGELIB_BUILD ) Modified: trunk/src/openmedialib/ml/CMakeLists.txt =================================================================== --- trunk/src/openmedialib/ml/CMakeLists.txt 2008-06-24 17:17:13 UTC (rev 1399) +++ trunk/src/openmedialib/ml/CMakeLists.txt 2008-06-25 10:11:17 UTC (rev 1400) @@ -2,8 +2,9 @@ include_directories( ${OpenLibraries_SOURCE_DIR}/src ) set( NAME openmedialib_ml ) +add_definitions( -DML_EXPORTS ) + if( WIN32 ) - add_definitions( -DML_EXPORTS ) add_definitions( -DOPENMEDIALIB_LIBNAME=\\\"${NAME}\\\" ) add_definitions( -DOPENMEDIALIB_VERSION=\\\"${VERSION_STRING}\\\" ) add_definitions( -DOPENMEDIALIB_BUILD ) Modified: trunk/src/openmedialib/plugins/avformat/CMakeLists.txt =================================================================== --- trunk/src/openmedialib/plugins/avformat/CMakeLists.txt 2008-06-24 17:17:13 UTC (rev 1399) +++ trunk/src/openmedialib/plugins/avformat/CMakeLists.txt 2008-06-25 10:11:17 UTC (rev 1400) @@ -5,7 +5,11 @@ include_directories( ${FFMPEG_INCLUDE_DIR} ) include_directories( ${OpenLibraries_SOURCE_DIR}/src ) - target_link_libraries( ${NAME} ${FFMPEG_LIBRARIES} ) + # required links + link_directories( ${OpenLibraries_BINARY_DIR}/src/openpluginlib/pl + ${OpenLibraries_BINARY_DIR}/src/openimagelib/il + ${openmedialib_ml_BINARY_DIR} + ${FFMPEG_LIBRARY_DIR} ) set( NAME openmedialib_avformat ) @@ -35,14 +39,12 @@ set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4244" ) endif( WIN32 ) - # required links - link_directories( ${OpenLibraries_BINARY_DIR}/src/openpluginlib/pl - ${OpenLibraries_BINARY_DIR}/src/openimagelib/il - ${openmedialib_ml_BINARY_DIR} ) target_link_libraries( ${NAME} "openpluginlib_pl${LIBRARY_IDENTIFIER}" "openimagelib_il${LIBRARY_IDENTIFIER}" "openmedialib_ml${LIBRARY_IDENTIFIER}" - ${Boost_FILESYSTEM_LIBRARY} ) + ${Boost_FILESYSTEM_LIBRARY} + ${FFMPEG_LIBRARIES} ) + else ( FFMPEG_FOUND ) message( "failed to find FFMPEG: try setting FFMPEGDIR" ) endif( FFMPEG_FOUND ) Modified: trunk/src/openobjectlib/sg/CMakeLists.txt =================================================================== --- trunk/src/openobjectlib/sg/CMakeLists.txt 2008-06-24 17:17:13 UTC (rev 1399) +++ trunk/src/openobjectlib/sg/CMakeLists.txt 2008-06-25 10:11:17 UTC (rev 1400) @@ -2,8 +2,8 @@ include_directories( ${OpenLibraries_SOURCE_DIR}/src ) set( NAME openobjectlib_sg ) +add_definitions( -DSG_EXPORTS ) if( WIN32 ) - add_definitions( -DSG_EXPORTS ) add_definitions( -DOPENOBJECTLIB_LIBNAME=\\\"${NAME}\\\" ) add_definitions( -DOPENOBJECTLIB_VERSION=\\\"${VERSION_STRING}\\\" ) add_definitions( -DOPENOBJECTLIB_BUILD ) Modified: trunk/src/openpluginlib/pl/CMakeLists.txt =================================================================== --- trunk/src/openpluginlib/pl/CMakeLists.txt 2008-06-24 17:17:13 UTC (rev 1399) +++ trunk/src/openpluginlib/pl/CMakeLists.txt 2008-06-25 10:11:17 UTC (rev 1400) @@ -2,8 +2,8 @@ include_directories( ${OpenLibraries_SOURCE_DIR}/src ) set( NAME openpluginlib_pl ) +add_definitions( -DOPENPLUGINLIB_EXPORTS ) if( WIN32 ) - add_definitions( -DOPENPLUGINLIB_EXPORTS ) add_definitions( -DOPENPLUGINLIB_LIBNAME=\\\"${NAME}\\\" ) add_definitions( -DOPENPLUGINLIB_VERSION=\\\"${VERSION_STRING}\\\" ) add_definitions( -DOPENPLUGINLIB_BUILD ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |