From 025edf958e15ea1dc0f7a63d7c4bd19272d27607 Mon Sep 17 00:00:00 2001 From: Pierre d'Herbemont Date: Sun, 4 May 2008 14:30:45 +0200 Subject: [PATCH] cmake: Set min version required, fix some warnings, remove network/error.c from src/CMakeLists.txt. --- extras/buildsystem/cmake/CMakeLists/root_CMakeLists.txt | 3 ++- extras/buildsystem/cmake/CMakeLists/src_CMakeLists.txt | 7 +++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/extras/buildsystem/cmake/CMakeLists/root_CMakeLists.txt b/extras/buildsystem/cmake/CMakeLists/root_CMakeLists.txt index 33363b3718..df4cf75e4d 100644 --- 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 5d84c5bff3..31c0fa21ca 100644 --- 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 -- 2.39.2