Changeset 10391

Timestamp:

06/23/09 12:53:55 (4 years ago)

Author:

robert

Message:

Added explict search for stdint.h

Location:

OpenSceneGraph/trunk

Files:

• CMakeModules/FindFFmpeg.cmake (modified) (3 diffs)
• src/osgPlugins/ffmpeg/CMakeLists.txt (modified) (1 diff)

OpenSceneGraph/trunk/CMakeModules/FindFFmpeg.cmake

@@ -91 +91 @@
 SET(FFMPEG_ROOT "$ENV{FFMPEG_DIR}" CACHE PATH "Location of FFMPEG")
 
+# find stdint.h
+FIND_PATH(FFMPEG_STDINT_INCLUDE_DIR stdint.h
+    PATHS
+    ${FFMPEG_ROOT}/include
+    $ENV{FFMPEG_DIR}/include
+    ~/Library/Frameworks
+    /Library/Frameworks
+    /usr/local/include
+    /usr/include
+    /sw/include # Fink
+    /opt/local/include # DarwinPorts
+    /opt/csw/include # Blastwave
+    /opt/include
+    /usr/freeware/include
+    PATH_SUFFIXES ffmpeg
+    DOC "Location of FFMPEG stdint.h Header"
+)
+
 FFMPEG_FIND(LIBAVFORMAT avformat avformat.h)
 FFMPEG_FIND(LIBAVDEVICE avdevice avdevice.h)
@@ -99 +117 @@
 SET(FFMPEG_FOUND "NO")
 # Note we don't check FFMPEG_LIBSWSCALE_FOUND here, it's optional.
-IF   (FFMPEG_LIBAVFORMAT_FOUND AND FFMPEG_LIBAVDEVICE_FOUND AND FFMPEG_LIBAVCODEC_FOUND AND FFMPEG_LIBAVUTIL_FOUND)
+IF   (FFMPEG_LIBAVFORMAT_FOUND AND FFMPEG_LIBAVDEVICE_FOUND AND FFMPEG_LIBAVCODEC_FOUND AND FFMPEG_LIBAVUTIL_FOUND AND FFMPEG_STDINT_INCLUDE_DIR)
 
     SET(FFMPEG_FOUND "YES")
@@ -114 +132 @@
         ${FFMPEG_LIBAVUTIL_LIBRARIES})
 
-ELSE (FFMPEG_LIBAVFORMAT_FOUND AND FFMPEG_LIBAVDEVICE_FOUND AND FFMPEG_LIBAVCODEC_FOUND AND FFMPEG_LIBAVUTIL_FOUND)
+ELSE ()
 
 #    MESSAGE(STATUS "Could not find FFMPEG")
 
-ENDIF(FFMPEG_LIBAVFORMAT_FOUND AND FFMPEG_LIBAVDEVICE_FOUND AND FFMPEG_LIBAVCODEC_FOUND AND FFMPEG_LIBAVUTIL_FOUND)
+ENDIF()

OpenSceneGraph/trunk/src/osgPlugins/ffmpeg/CMakeLists.txt

@@ -7 +7 @@
     ${FFMPEG_LIBAVCODEC_INCLUDE_DIRS} ${FFMPEG_LIBAVCODEC_INCLUDE_DIRS}/libavcodec
     ${FFMPEG_LIBAVUTIL_INCLUDE_DIRS} ${FFMPEG_LIBAVUTIL_INCLUDE_DIRS}/libavcodec
+    ${FFMPEG_STDINT_INCLUDE_DIR}
 )