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
1022b5b9
Commit
1022b5b9
authored
Oct 19, 2015
by
Davis King
Browse files
Changed compiler versions to ones that have thread_local.
parent
a47fd477
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
dlib/use_cpp_11.cmake
dlib/use_cpp_11.cmake
+2
-2
No files found.
dlib/use_cpp_11.cmake
View file @
1022b5b9
...
@@ -27,7 +27,7 @@ include(${dlib_path}/add_global_compiler_switch.cmake)
...
@@ -27,7 +27,7 @@ include(${dlib_path}/add_global_compiler_switch.cmake)
if
(
CMAKE_VERSION VERSION_LESS
"3.1"
)
if
(
CMAKE_VERSION VERSION_LESS
"3.1"
)
if
(
CMAKE_COMPILER_IS_GNUCXX
)
if
(
CMAKE_COMPILER_IS_GNUCXX
)
execute_process
(
COMMAND
${
CMAKE_CXX_COMPILER
}
-dumpversion OUTPUT_VARIABLE GCC_VERSION
)
execute_process
(
COMMAND
${
CMAKE_CXX_COMPILER
}
-dumpversion OUTPUT_VARIABLE GCC_VERSION
)
if
(
GCC_VERSION VERSION_GREATER 4.
7
OR GCC_VERSION VERSION_EQUAL 4.
7
)
if
(
GCC_VERSION VERSION_GREATER 4.
8
OR GCC_VERSION VERSION_EQUAL 4.
8
)
message
(
STATUS
"C++11 activated."
)
message
(
STATUS
"C++11 activated."
)
add_global_compiler_switch
(
"-std=gnu++11"
)
add_global_compiler_switch
(
"-std=gnu++11"
)
set
(
COMPILER_CAN_DO_CPP_11 1
)
set
(
COMPILER_CAN_DO_CPP_11 1
)
...
@@ -35,7 +35,7 @@ if (CMAKE_VERSION VERSION_LESS "3.1")
...
@@ -35,7 +35,7 @@ if (CMAKE_VERSION VERSION_LESS "3.1")
elseif
(
"
${
CMAKE_CXX_COMPILER_ID
}
"
STREQUAL
"Clang"
)
elseif
(
"
${
CMAKE_CXX_COMPILER_ID
}
"
STREQUAL
"Clang"
)
execute_process
(
COMMAND
${
CMAKE_CXX_COMPILER
}
--version OUTPUT_VARIABLE clang_full_version_string
)
execute_process
(
COMMAND
${
CMAKE_CXX_COMPILER
}
--version OUTPUT_VARIABLE clang_full_version_string
)
string
(
REGEX REPLACE
".*clang version ([0-9]+
\\
.[0-9]+).*"
"
\\
1"
CLANG_VERSION
${
clang_full_version_string
}
)
string
(
REGEX REPLACE
".*clang version ([0-9]+
\\
.[0-9]+).*"
"
\\
1"
CLANG_VERSION
${
clang_full_version_string
}
)
if
(
CLANG_VERSION VERSION_GREATER 3.
1
)
if
(
CLANG_VERSION VERSION_GREATER 3.
3
)
message
(
STATUS
"C++11 activated."
)
message
(
STATUS
"C++11 activated."
)
add_global_compiler_switch
(
"-std=c++11"
)
add_global_compiler_switch
(
"-std=c++11"
)
set
(
COMPILER_CAN_DO_CPP_11 1
)
set
(
COMPILER_CAN_DO_CPP_11 1
)
...
...
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