Changeset 1400

Timestamp:

06/25/08 05:11:17 (5 months ago)

Author:

timdewhirst

Message:

CMake
- more fixes to cmake building on windows; this now will generate a build of olibs with FFMPEG, OpenAL and SDL

Location:

trunk

Files:

• FindFFMPEG.cmake (modified) (3 diffs)
• src/openassetlib/al/CMakeLists.txt (modified) (1 diff)
• src/openeffectslib/plugins/tonemap/CMakeLists.txt (modified) (1 diff)
• src/openimagelib/il/CMakeLists.txt (modified) (1 diff)
• src/openmedialib/ml/CMakeLists.txt (modified) (1 diff)
• src/openmedialib/plugins/avformat/CMakeLists.txt (modified) (2 diffs)
• src/openobjectlib/sg/CMakeLists.txt (modified) (1 diff)
• src/openpluginlib/pl/CMakeLists.txt (modified) (1 diff)

trunk/FindFFMPEG.cmake

@@ -16 +16 @@
               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
@@ -99 +94 @@
 
 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 )
 
@@ -128 +114 @@
               ${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
-)

trunk/src/openassetlib/al/CMakeLists.txt

@@ -3 +3 @@
 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}\\\" )

trunk/src/openeffectslib/plugins/tonemap/CMakeLists.txt

@@ +1 @@
+
+set ( NAME openeffectslib_tonemap )
+
 find_package ( OpenEXR )
+if ( OPENEXR_FOUND )
+   add_definitions( -DML_EXPORTS )
+   set ( SOURCES tonemap_plugin.cpp )
 
-set ( NAME openeffectsib_tonemap )
+   include_directories ( ${Boost_INCLUDE_DIR}i
+                         ${OpenLibraries_SOURCE_DIR}/src )
 
-set ( SOURCES tonemap_plugin.cpp )
+   add_library ( ${NAME} SHARED ${SOURCES} )
 
-include_directories ( ${Boost_INCLUDE_DIR}i
-                      ${OpenLibraries_SOURCE_DIR}/src )
+   link_directories ( ${OpenLibraries_BINARY_DIR}/src/openpluginlib/pl/
+                      ${OpenLibraries_BINARY_DIR}/src/openimagelib/il/ )
 
-add_library ( ${NAME} SHARED ${SOURCES} )
+   target_link_libraries ( ${NAME} "openpluginlib_pl${LIBRARY_IDENTIFIER}"
+                                   "openimagelib_il${LIBRARY_IDENTIFIER}"
+                                   ${Boost_FILESYSTEM_LIBRARY}
+                                   ${OpenEXR_LIBRARIES} )
 
-link_directories ( ${OpenLibraries_BINARY_DIR}/src/openpluginlib/pl/
-                   ${OpenLibraries_BINARY_DIR}/src/openimagelib/il/ )
+   add_definitions ( ${OpenEXR_CFLAGS} ${IlmBase_CFLAGS} )
 
-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} 
-          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 )

trunk/src/openimagelib/il/CMakeLists.txt

@@ -3 +3 @@
 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}\\\" )

trunk/src/openmedialib/ml/CMakeLists.txt

@@ -3 +3 @@
 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}\\\" )

trunk/src/openmedialib/plugins/avformat/CMakeLists.txt

@@ -6 +6 @@
    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 )
@@ -36 +40 @@
    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" )

trunk/src/openobjectlib/sg/CMakeLists.txt

@@ -3 +3 @@
 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}\\\" )

trunk/src/openpluginlib/pl/CMakeLists.txt

@@ -3 +3 @@
 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}\\\" )