[vlc-devel] commit: Use cmake 2.6.0 release ( Rafaël Carré )

[git version control]

vlc | branch: master | Rafaël Carré <funman at videolan.org> | Wed May 21 20:45:24 2008 +0200| [8d961ec721f5016fbf60f1959a0caafb75a86a16]

Use cmake 2.6.0 release

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=8d961ec721f5016fbf60f1959a0caafb75a86a16
---

 extras/contrib/src/Makefile     |   14 +++++++-------
 extras/contrib/src/packages.mak |    4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 4c2b485..1e278c0 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -262,14 +262,14 @@ DISTCLEAN_PKG += autoconf-$(AUTOCONF_VERSION).tar.bz2
 # ***************************************************************************
 # CMake
 # ***************************************************************************
-# cmake-$(CMAKE_VERSION).tar.gz:
-# 	$(WGET) $(CMAKE_URL)
-# 	
-# cmake: cmake-$(CMAKE_VERSION).tar.gz
-# 	$(EXTRACT_GZ)
+cmake-$(CMAKE_VERSION).tar.gz:
+	$(WGET) $(CMAKE_URL)
+
+cmake: cmake-$(CMAKE_VERSION).tar.gz
+	$(EXTRACT_GZ)
 	
-cmake: 
-	cvs -d :pserver:anonymous:cmake at www.cmake.org:/cvsroot/CMake co -d cmake CMake
+#cmake:
+#	cvs -d :pserver:anonymous:cmake at www.cmake.org:/cvsroot/CMake co -d cmake CMake
 
 .cmake: cmake
 	(cd $<; ./configure --prefix=$(PREFIX) && make && make install)
diff --git a/extras/contrib/src/packages.mak b/extras/contrib/src/packages.mak
index 242ec1c..f54f5e8 100644
--- a/extras/contrib/src/packages.mak
+++ b/extras/contrib/src/packages.mak
@@ -38,8 +38,8 @@ LIBAMR_WB=$(PENGUIN)/amrwb-$(LIBAMR_WB_VERSION).tar.bz2
 # we have to use a newer though, because bootstrap won't work otherwise
 AUTOCONF_VERSION=2.61
 AUTOCONF_URL=$(GNU)/autoconf/autoconf-$(AUTOCONF_VERSION).tar.bz2
-CMAKE_VERSION=2.4.8
-CMAKE_URL=http://www.cmake.org/files/v2.4/cmake-$(CMAKE_VERSION).tar.gz
+CMAKE_VERSION=2.6.0
+CMAKE_URL=http://www.cmake.org/files/v2.6/cmake-$(CMAKE_VERSION).tar.gz
 LIBTOOL_VERSION=1.5.24
 LIBTOOL_URL=$(GNU)/libtool/libtool-$(LIBTOOL_VERSION).tar.gz
 AUTOMAKE_VERSION=1.9.6