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
3a65e1c7
"...v2/git@developer.sourcefind.cn:OpenDAS/vision.git" did not exist on "8324c481dd4c3096697332d76fbdc9d912f7360b"
Commit
3a65e1c7
authored
Oct 17, 2015
by
Davis King
Browse files
Apparently you need gcc 4.7 or newer for this stuff.
parent
bf93f4f3
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
5 deletions
+1
-5
dlib/CMakeLists.txt
dlib/CMakeLists.txt
+1
-1
dlib/use_cpp_11.cmake
dlib/use_cpp_11.cmake
+0
-4
No files found.
dlib/CMakeLists.txt
View file @
3a65e1c7
...
@@ -409,7 +409,7 @@ if (NOT TARGET dlib)
...
@@ -409,7 +409,7 @@ if (NOT TARGET dlib)
find_package
(
CUDA 7.0
)
find_package
(
CUDA 7.0
)
if
(
CUDA_FOUND
)
if
(
CUDA_FOUND
AND COMPILER_CAN_DO_CPP_11
)
set
(
CUDA_HOST_COMPILATION_CPP ON
)
set
(
CUDA_HOST_COMPILATION_CPP ON
)
# Note that we add __STRICT_ANSI__ to avoid freaking out nvcc with gcc specific
# Note that we add __STRICT_ANSI__ to avoid freaking out nvcc with gcc specific
...
...
dlib/use_cpp_11.cmake
View file @
3a65e1c7
...
@@ -24,10 +24,6 @@ if (CMAKE_VERSION VERSION_LESS "3.1")
...
@@ -24,10 +24,6 @@ if (CMAKE_VERSION VERSION_LESS "3.1")
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
)
elseif
(
GCC_VERSION VERSION_GREATER 4.3 OR GCC_VERSION VERSION_EQUAL 4.3
)
message
(
STATUS
"C++0x activated."
)
add_global_compiler_switch
(
"-std=gnu++0x"
)
set
(
COMPILER_CAN_DO_CPP_11 1
)
endif
()
endif
()
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
)
...
...
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