[vlmc-devel] cmake: Simplify version requirements

Hugo Beauzée-Luyssen git at videolan.org
Fri Apr 1 23:56:24 CEST 2016


vlmc | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Fri Apr  1 23:55:32 2016 +0200| [af1dcb807036336406e5b79f88c36338f45b4ff4] | committer: Hugo Beauzée-Luyssen

cmake: Simplify version requirements

> https://code.videolan.org/videolan/vlmc/commit/af1dcb807036336406e5b79f88c36338f45b4ff4
---

 CMakeLists.txt        | 4 ++--
 src/CMakeLists.txt    | 3 ---
 ts/translations.cmake | 2 --
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4703791..6fffdff 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,6 +5,8 @@
 #          Hugo Beauzée-Luyssen <hugo at beauzee.fr>
 #
 
+cmake_minimum_required(VERSION 3.1)
+
 # Set path to additional CMake modules
 SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
 
@@ -39,7 +41,6 @@ IF(WIN32)
 ENDIF(WIN32)
 
 # version: 0.2.x
-cmake_policy(SET CMP0048 NEW)
 STRING(TOLOWER ${PROJECT_NAME_SHORT} PROJECT_NAME_SHORT_LOWER)
 PROJECT(${PROJECT_NAME_SHORT_LOWER} VERSION 0.2.0)
 append_git_version()
@@ -58,7 +59,6 @@ SITE_NAME(HOSTNAME)
 SET(SYSNAME ${CMAKE_SYSTEM}-${CMAKE_SYSTEM_PROCESSOR})
 
 # CMake Settings
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8)
 SET(CMAKE_COLOR_MAKEFILE ON)
 SET(CMAKE_VERBOSE_MAKEFILE OFF)
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 54e3686..647f6dc 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -3,9 +3,6 @@
 # Authors: Rohit Yadav <rohityadav89 at gmail.com>
 #          Ludovic Fauvet <etix at vlmc.org>
 #
-#check if version will support target_compile_features command
-#to ensure we can use some C++11 featrues
-cmake_minimum_required(VERSION 3.1)
 
 # Manually set Qt5 path for OSX installed using brew
 SET(CMAKE_PREFIX_PATH "/usr/local/opt/qt5")
diff --git a/ts/translations.cmake b/ts/translations.cmake
index f1b63c1..48e9bc1 100644
--- a/ts/translations.cmake
+++ b/ts/translations.cmake
@@ -5,8 +5,6 @@
 #          Hugo Beauzée-Luyssen <hugo at beauzee.fr>
 #
 
-cmake_minimum_required(VERSION 3.1)
-
 function(vlmc_get_ts_files VLMC_TS_FILES_OUT)
     SET(ALL_LANGUAGES
             ca



More information about the Vlmc-devel mailing list