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
f18f753c
Commit
f18f753c
authored
Oct 16, 2017
by
Davis King
Browse files
CMake tweaks to avoid errors in visual studio
parent
3b2d73db
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
1 deletion
+4
-1
dlib/cmake_utils/set_compiler_specific_options.cmake
dlib/cmake_utils/set_compiler_specific_options.cmake
+3
-0
dlib/cmake_utils/use_cpp_11.cmake
dlib/cmake_utils/use_cpp_11.cmake
+1
-1
No files found.
dlib/cmake_utils/set_compiler_specific_options.cmake
View file @
f18f753c
cmake_minimum_required
(
VERSION 2.8.12
)
if
(
POLICY CMP0054
)
cmake_policy
(
SET CMP0054 NEW
)
endif
()
set
(
USING_OLD_VISUAL_STUDIO_COMPILER 0
)
if
(
MSVC AND MSVC_VERSION VERSION_LESS 1900
)
...
...
dlib/cmake_utils/use_cpp_11.cmake
View file @
f18f753c
...
...
@@ -80,7 +80,7 @@ else()
cxx_delegating_constructors
cxx_thread_local
cxx_constexpr
cxx_decltype_incomplete_return_types
#
cxx_decltype_incomplete_return_types
# purposfully commented out because cmake errors out on this when using visual studio and cmake 3.8.0
cxx_auto_type
)
...
...
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