Skip to content

D
dlib
Commit edf0310a authored by Davis King's avatar Davis King
Browse files
Options

Made cmake scripts uniformly require cmake version 2.8.4.

parent 839acd3e
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 7 deletions
dlib/CMakeLists.txt
View file @ edf0310a
...@@ -3,11 +3,8 @@ ...@@ -3,11 +3,8 @@
# information about it at http://www.cmake.org # information about it at http://www.cmake.org
# #
# setting this makes CMake allow normal looking if else statements
SET(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true)
cmake_minimum_required(VERSION 2.4) cmake_minimum_required(VERSION 2.8.4)
set(CMAKE_LEGACY_CYGWIN_WIN32 0) # Remove when CMake >= 2.8.4 is required
# default to a Release build (except if CMAKE_BUILD_TYPE is set) # default to a Release build (except if CMAKE_BUILD_TYPE is set)
include(release_build_by_default) include(release_build_by_default)
......
dlib/cmake
View file @ edf0310a
...@@ -3,10 +3,9 @@ ...@@ -3,10 +3,9 @@
# including it # including it
set(DLIB_IN_PROJECT_BUILD true) set(DLIB_IN_PROJECT_BUILD true)
cmake_minimum_required(VERSION 2.6.4) cmake_minimum_required(VERSION 2.8.4)
set(CMAKE_LEGACY_CYGWIN_WIN32 0) # Remove when CMake >= 2.8.4 is required
if (POLICY CMP0054) if (POLICY CMP0054)
cmake_policy(SET CMP0054 NEW) cmake_policy(SET CMP0054 NEW)
endif() endif()
......
dlib/tell_visual_studio_to_use_static_runtime.cmake
View file @ edf0310a
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# Including this cmake script into your cmake project will cause visual studio # Including this cmake script into your cmake project will cause visual studio
# to build your project against the static C runtime. # to build your project against the static C runtime.
cmake_minimum_required(VERSION 2.6.4) cmake_minimum_required(VERSION 2.8.4)
if (POLICY CMP0054) if (POLICY CMP0054)
cmake_policy(SET CMP0054 NEW) cmake_policy(SET CMP0054 NEW)
endif() endif()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment