[vlmc-devel] commit: Dpkg, rpmbuild finder cmake modules, updated paths for Mac OS ( Rohit Yadav )

[git at videolan.org]

vlmc | branch: master | Rohit Yadav <rohityadav89 at gmail.com> | Wed Jun  2 22:27:44 2010 +0200| [9ff8b67e00e5eec3877096efe03675c690151131] | committer: Hugo Beauzée-Luyssen 

Dpkg, rpmbuild finder cmake modules, updated paths for Mac OS

Signed-off-by: Hugo Beauzée-Luyssen <beauze.h at gmail.com>

> http://git.videolan.org/gitweb.cgi/vlmc.git/?a=commit;h=9ff8b67e00e5eec3877096efe03675c690151131
---

 cmake/DpkgBuild.cmake  |   17 +++++++++++++++++
 cmake/FindLIBVLC.cmake |    9 +++++++++
 cmake/RpmBuild.cmake   |   17 +++++++++++++++++
 3 files changed, 43 insertions(+), 0 deletions(-)

diff --git a/cmake/DpkgBuild.cmake b/cmake/DpkgBuild.cmake
new file mode 100644
index 0000000..918e687
--- /dev/null
+++ b/cmake/DpkgBuild.cmake
@@ -0,0 +1,17 @@
+#
+# VLMC DPKG Finder
+# Authors: Rohit Yadav <rohityadav89 at gmail.com>
+#
+
+FIND_PROGRAM(DPKG
+    NAMES dpkg-deb
+    PATHS "/usr/bin") #Add paths here
+
+IF ( DPKG )
+    GET_FILENAME_COMPONENT(DPKG_PATH ${DPKG} ABSOLUTE)
+    MESSAGE(STATUS "Found dpkg-deb : ${DPKG_PATH}")
+    SET(DPKG_FOUND "YES")
+ELSE ( DPKG ) 
+    MESSAGE(STATUS "dpkg-deb NOT found. deb generation will not be available")
+    SET(DPKG_FOUND "NO")
+ENDIF ( DPKG )
diff --git a/cmake/FindLIBVLC.cmake b/cmake/FindLIBVLC.cmake
index 537d7d7..29a9660 100644
--- a/cmake/FindLIBVLC.cmake
+++ b/cmake/FindLIBVLC.cmake
@@ -26,6 +26,9 @@ FIND_PATH(LIBVLC_INCLUDE_DIR vlc/vlc.h
     "/usr/include/vlc"
     "/usr/local/include"
     "/usr/local/include/vlc"
+    #Mac OS
+    "${CMAKE_CURRENT_SOURCE_DIR}/contribs/include"
+    "${CMAKE_CURRENT_SOURCE_DIR}/contribs/include/vlc"
     #mingw
     c:/msys/local/include
   )
@@ -37,6 +40,9 @@ FIND_LIBRARY(LIBVLC_LIBRARY NAMES vlc libvlc
   HINTS "$ENV{LIBVLC_LIBRARY_PATH}"
   PATHS
     "$ENV{LIB_DIR}/lib"
+    #Mac OS
+    "${CMAKE_CURRENT_SOURCE_DIR}/contribs/lib"
+    "${CMAKE_CURRENT_SOURCE_DIR}/contribs/plugins"
     #mingw
     c:/msys/local/lib
   )
@@ -45,6 +51,9 @@ FIND_LIBRARY(LIBVLCCORE_LIBRARY NAMES vlccore libvlccore
   HINTS "$ENV{LIBVLC_LIBRARY_PATH}"
   PATHS
     "$ENV{LIB_DIR}/lib"
+    #Mac OS
+    "${CMAKE_CURRENT_SOURCE_DIR}/contribs/lib"
+    "${CMAKE_CURRENT_SOURCE_DIR}/contribs/plugins"
     #mingw
     c:/msys/local/lib
   )
diff --git a/cmake/RpmBuild.cmake b/cmake/RpmBuild.cmake
new file mode 100644
index 0000000..4faa88b
--- /dev/null
+++ b/cmake/RpmBuild.cmake
@@ -0,0 +1,17 @@
+#
+# VLMC RPM Finder
+# Authors: Rohit Yadav <rohityadav89 at gmail.com>
+#
+
+FIND_PROGRAM(RPMBUILD
+    NAMES rpmbuild
+    PATHS "/usr/bin")
+
+IF ( RPMBUILD )
+    GET_FILENAME_COMPONENT(RPMBUILD_PATH ${RPMBUILD} ABSOLUTE)
+    MESSAGE(STATUS "Found rpmbuild : ${RPMBUILD_PATH}")
+    SET(RPMBUILD_FOUND "YES")
+ELSE ( RPMBUILD ) 
+    MESSAGE(STATUS "rpmbuild NOT found. RPM generation will not be available")
+    SET(RPMBUILD_FOUND "NO")
+ENDIF ( RPMBUILD )