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

[vlc] / extras / buildsystem / cmake / CMakeLists / root_CMakeLists.txt

diff --git a/extras/buildsystem/cmake/CMakeLists/root_CMakeLists.txt b/extras/buildsystem/cmake/CMakeLists/root_CMakeLists.txt
index 2849ca6830e62c94fe02de36eddfa11a4aee29e9..df4cf75e4d684363af6a0d0b4a243e277be0db06 100644 (file)
--- a/extras/buildsystem/cmake/CMakeLists/root_CMakeLists.txt
+++ b/extras/buildsystem/cmake/CMakeLists/root_CMakeLists.txt
@@ -1,5 +1,8 @@
 PROJECT(vlc)
 
+cmake_policy(VERSION 2.6)
+cmake_minimum_required(VERSION 2.6)
+
 ENABLE_TESTING()
 
 # Set the module path
@@ -14,6 +17,11 @@ include( config )
 # Global definitions
 add_definitions(-DHAVE_CONFIG_H)
 add_definitions(-D__LIBVLC__)
+# Large file support for Solaris and Linux:
+add_definitions(-D_FILE_OFFSET_BITS=64 -D__USE_UNIX98 -D_LARGEFILE64_SOURCE)
+# Thread safety:
+add_definitions(-D_REENTRANT -D_THREAD_SAFE)
+
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99")
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
@@ -24,9 +32,11 @@ add_definitions(-D_GNU_SOURCE)
 include_directories(${CMAKE_SOURCE_DIR}/include ${CMAKE_BINARY_DIR}/include)
 
 # our sources:
+add_subdirectory(libs/loader)
 add_subdirectory(src)
 add_subdirectory(modules)
 add_subdirectory(po)
+add_subdirectory(test)
 
 # Enable uninstall
 configure_file(