cmake: Set min version required, fix some warnings, remove network/error.c from src...

diff --git a/extras/buildsystem/cmake/CMakeLists/root_CMakeLists.txt b/extras/buildsystem/cmake/CMakeLists/root_CMakeLists.txt
index 33363b371852650e3b51ad790daa0a8c1c467f6f..df4cf75e4d684363af6a0d0b4a243e277be0db06 100644 (file)
--- a/extras/buildsystem/cmake/CMakeLists/root_CMakeLists.txt
+++ b/extras/buildsystem/cmake/CMakeLists/root_CMakeLists.txt
@@ -1,6 +1,7 @@
 PROJECT(vlc)
 
-CMAKE_POLICY(VERSION 2.5)
+cmake_policy(VERSION 2.6)
+cmake_minimum_required(VERSION 2.6)
 
 ENABLE_TESTING()
 

diff --git a/extras/buildsystem/cmake/CMakeLists/src_CMakeLists.txt b/extras/buildsystem/cmake/CMakeLists/src_CMakeLists.txt
index 5d84c5bff3a584bfb9a9b9f57f8993cf0f422ce6..31c0fa21ca8ccc13f6ee0d32ddaa77c0d733a83b 100644 (file)
--- a/extras/buildsystem/cmake/CMakeLists/src_CMakeLists.txt
+++ b/extras/buildsystem/cmake/CMakeLists/src_CMakeLists.txt
@@ -1,8 +1,8 @@
 
 add_definitions(-Dasm=__asm__ -D_INTL_REDIRECT_MACROS)
-add_definitions(-DLOCALEDIR=\\"${CMAKE_INSTALL_PREFIX}/locale\\")
-add_definitions(-DPLUGIN_PATH=\\"${CMAKE_INSTALL_PREFIX}/lib/vlc\\")
-add_definitions(-DDATA_PATH=\\"${CMAKE_INSTALL_PREFIX}/share/vlc\\")
+add_definitions(-DLOCALEDIR="${CMAKE_INSTALL_PREFIX}/locale")
+add_definitions(-DPLUGIN_PATH="${CMAKE_INSTALL_PREFIX}/lib/vlc")
+add_definitions(-DDATA_PATH="${CMAKE_INSTALL_PREFIX}/share/vlc")
 
 # vlc
 add_executable(vlc vlc.c)
@@ -76,7 +76,6 @@ set( SOURCES_libvlc_common
     network/acl.c
     network/getaddrinfo.c
     network/io.c
-    network/error.c
     network/tcp.c
     network/udp.c
     network/httpd.c