[Jahshaka-cvs] SF.net SVN: openlibraries: [1400] trunk

[<tim...@us...>]

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.