Changeset f98d6a45b17127f51bda0591af1f3dafe6b1cf44

Timestamp:

02/14/08 01:04:12 (7 months ago)

Author:

Pierre d'Herbemont <pdherbemont@videolan.org>

git-committer:

Pierre d'Herbemont <pdherbemont@videolan.org> 1202947452 +0000

git-parent:

[8eff8faa0822c35f7665a577725cf2e9088a3ee0]

git-author:

Pierre d'Herbemont <pdherbemont@videolan.org> 1202947452 +0000

Message:

cmake: Find libdvbpsi, libmpeg2.

Files:

• extras/buildsystem/cmake/include/FindDvbpsi.cmake (added)
• extras/buildsystem/cmake/include/FindMpeg2.cmake (added)
• extras/buildsystem/cmake/include/config.cmake (modified) (2 diffs)

extras/buildsystem/cmake/include/config.cmake

@@ -119 +119 @@
-set(CMAKE_EXTRA_INCLUDE_FILES arpa/inet.h)
-vlc_check_functions_exist(inet_aton inet_ntop inet_pton)
+set(CMAKE_EXTRA_INCLUDE_FILES)
+
+set(CMAKE_EXTRA_INCLUDE_FILES sys/mman.h)
+vlc_check_functions_exist(mmap)
-set(CMAKE_EXTRA_INCLUDE_FILES)
-
@@ -492 +496 @@
-endif(X11_FOUND)
-
+find_package(Mpeg2)
+if(Mpeg2_FOUND)
+  vlc_enable_modules(libmpeg2)
+  check_include_files ("stdint.h;mpeg2dec/mpeg2.h" HAVE_MPEG2DEC_MPEG2_H)
+  vlc_module_add_link_libraries(libmpeg2 ${Mpeg2_LIBRARIES})
+endif(Mpeg2_FOUND)
+
+find_package(Dvbpsi)
+if(Dvbpsi_FOUND)
+  vlc_enable_modules(ts)
+  set(CMAKE_REQUIRED_INCLUDES ${CONTRIB_INCLUDE})
+  check_include_files ("stdint.h;dvbpsi/dvbpsi.h;dvbpsi/demux.h;dvbpsi/descriptor.h;dvbpsi/pat.h;dvbpsi/pmt.h;dvbpsi/sdt.h;dvbpsi/dr.h" HAVE_DVBPSI_DR_H)
+  vlc_module_add_link_libraries(ts ${Dvbpsi_LIBRARIES})
+endif(Dvbpsi_FOUND)
+
+
+
-set(CMAKE_REQUIRED_INCLUDES)
-