Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
OpenDAS
dlib
Commits
edf0310a
Commit
edf0310a
authored
Oct 11, 2015
by
Davis King
Browse files
Made cmake scripts uniformly require cmake version 2.8.4.
parent
839acd3e
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
7 deletions
+3
-7
dlib/CMakeLists.txt
dlib/CMakeLists.txt
+1
-4
dlib/cmake
dlib/cmake
+1
-2
dlib/tell_visual_studio_to_use_static_runtime.cmake
dlib/tell_visual_studio_to_use_static_runtime.cmake
+1
-1
No files found.
dlib/CMakeLists.txt
View file @
edf0310a
...
...
@@ -3,11 +3,8 @@
# 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
)
set
(
CMAKE_LEGACY_CYGWIN_WIN32 0
)
# Remove when CMake >= 2.8.4 is required
cmake_minimum_required
(
VERSION 2.8.4
)
# default to a Release build (except if CMAKE_BUILD_TYPE is set)
include
(
release_build_by_default
)
...
...
dlib/cmake
View file @
edf0310a
...
...
@@ -3,10 +3,9 @@
# including it
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)
cmake_policy(SET CMP0054 NEW)
endif()
...
...
dlib/tell_visual_studio_to_use_static_runtime.cmake
View file @
edf0310a
...
...
@@ -2,7 +2,7 @@
# Including this cmake script into your cmake project will cause visual studio
# 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
)
cmake_policy
(
SET CMP0054 NEW
)
endif
()
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment