Changeset 1413

Timestamp:

08/01/08 11:32:41 (4 months ago)

Author:

timdewhirst

Message:

olibs
- remove python boost lib by default
- add iostream boost lib by default
- add code to generate openlibraries.pc
- fixup default plugin location defines (needs checking on windows)

Files:

• trunk/CMakeLists.txt (modified) (3 diffs)

trunk/CMakeLists.txt

@@ -13 +13 @@
 if ( NOT OPTION_UMBRELLA )
    message( "defining plugin paths" )
-   add_definitions( -DOPENIMAGELIB_PLUGINS="\\\"${CMAKE_INSTALL_PREFIX}/lib/${PACKAGE}/openimagelib/plugins\\\"" )
-   add_definitions( -DOPENMEDIALIB_PLUGINS="\\\"${CMAKE_INSTALL_PREFIX}/lib/${PACKAGE}/openmedialib/plugins\\\"" )
-   add_definitions( -DOPENASSETLIB_PLUGINS="\\\"${CMAKE_INSTALL_PREFIX}/lib/${PACKAGE}/openassetlib/plugins\\\"" )
-   add_definitions( -DOPENOBJECTLIB_PLUGINS="\\\"${CMAKE_INSTALL_PREFIX}/lib/${PACKAGE}/openobjectlib/plugins\\\"" )
-   add_definitions( -DOPENEFFECTSLIB_PLUGINS="\\\"${CMAKE_INSTALL_PREFIX}/lib/${PACKAGE}/openeffectslib/plugins\\\"" )
+   add_definitions( -DOPENIMAGELIB_PLUGINS="${CMAKE_INSTALL_PREFIX}/lib/${PACKAGE}/openimagelib/plugins" )
+   add_definitions( -DOPENMEDIALIB_PLUGINS="${CMAKE_INSTALL_PREFIX}/lib/${PACKAGE}/openmedialib/plugins" )
+   add_definitions( -DOPENASSETLIB_PLUGINS="${CMAKE_INSTALL_PREFIX}/lib/${PACKAGE}/openassetlib/plugins" )
+   add_definitions( -DOPENOBJECTLIB_PLUGINS="${CMAKE_INSTALL_PREFIX}/lib/${PACKAGE}/openobjectlib/plugins" )
+   add_definitions( -DOPENEFFECTSLIB_PLUGINS="${CMAKE_INSTALL_PREFIX}/lib/${PACKAGE}/openeffectslib/plugins" )
 endif( NOT OPTION_UMBRELLA )
 
@@ -25 +25 @@
 
 # boost
-find_package( Boost COMPONENTS filesystem python regex thread REQUIRED )
+find_package( Boost COMPONENTS filesystem regex thread iostreams REQUIRED )
 if ( Boost_FOUND )
    message( "found boost: ${Boost_INCLUDE_DIR}" )
@@ -102 +102 @@
 
 add_subdirectory( src )
+
+# function to convert a list (with their damned semicolons)
+# to a space separated list
+FUNCTION( CONVERT_LIST_TO_STRING _list _result )
+   SET( result )
+   LIST( LENGTH ${_list} _len ) 
+
+   # hack for brain dead range command... I mean, RANGE N yields N+1 numbers
+   MATH( EXPR len ${_len}-1 )
+   FOREACH( index RANGE 0 ${len} )
+      LIST( GET ${_list} ${index} li )
+      SET( result "${result} ${li}" )
+   ENDFOREACH( index RANGE 0 ${len} )
+
+   SET( ${_result} ${result} PARENT_SCOPE )
+ENDFUNCTION( CONVERT_LIST_TO_STRING )
+
+# create openlibraries.pc for UNIX
+if ( NOT WIN32 )
+   list( APPEND EXTRA_LIBS_LIST -L${Boost_LIBRARY_DIRS} -lboost_filesystem )
+   if ( GLEW_FOUND )
+         list( APPEND EXTRA_LIBS_LIST -L${GLEW_LIBRARY_DIR} -lGLEW )
+         list( APPEND EXTRA_LIBS_LIST -L${libdir}/openobjectlib/lib -lopenobjectlib_sg )
+   endif ( GLEW_FOUND )
+
+   CONVERT_LIST_TO_STRING( EXTRA_LIBS_LIST EXTRA_LIBS )
+
+   list( APPEND EXTRA_INCLUDE_LIST -I${Boost_INCLUDE_DIRS} )
+   if ( GLEW_FOUND )
+         list( APPEND EXTRA_INCLUDE_LIST -I${GLEW_INCLUDE_DIR} )
+   endif ( GLEW_FOUND )
+
+   CONVERT_LIST_TO_STRING( EXTRA_INCLUDE_LIST EXTRA_INCLUDES )
+
+   configure_file( openlibraries.pc.cmake ${CMAKE_SOURCE_DIR}/openlibraries.pc @ONLY )
+   install( 
+        FILES
+        ${CMAKE_SOURCE_DIR}/openlibraries.pc
+        DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig/" )
+endif ( NOT WIN32 )