Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
opencv
Commits
7ad5d219
Commit
7ad5d219
authored
Apr 16, 2019
by
Alexander Alekhin
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #14339 from alalek:cmake_fix_std_cxx11
parents
46353564
a56c1227
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
8 deletions
+1
-8
OpenCVDetectCXXCompiler.cmake
cmake/OpenCVDetectCXXCompiler.cmake
+1
-1
OpenCVDetectInferenceEngine.cmake
cmake/OpenCVDetectInferenceEngine.cmake
+0
-7
No files found.
cmake/OpenCVDetectCXXCompiler.cmake
View file @
7ad5d219
...
...
@@ -176,7 +176,7 @@ if(CMAKE_CXX11_COMPILE_FEATURES)
endif
()
if
(
NOT HAVE_CXX11
)
ocv_check_compiler_flag
(
CXX
""
HAVE_CXX11
"
${
OpenCV_SOURCE_DIR
}
/cmake/checks/cxx11.cpp"
)
if
(
NOT HAVE_CXX11
AND ENABLE_CXX11
)
if
(
NOT HAVE_CXX11
)
ocv_check_compiler_flag
(
CXX
"-std=c++11"
HAVE_STD_CXX11
"
${
OpenCV_SOURCE_DIR
}
/cmake/checks/cxx11.cpp"
)
if
(
HAVE_STD_CXX11
)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-std=c++11"
)
...
...
cmake/OpenCVDetectInferenceEngine.cmake
View file @
7ad5d219
...
...
@@ -17,13 +17,6 @@
# INF_ENGINE_TARGET - set to name of imported library target representing InferenceEngine
#
if
(
NOT HAVE_CXX11
)
message
(
WARNING
"DL Inference engine requires C++11. You can turn it on via ENABLE_CXX11=ON CMake flag."
)
return
()
endif
()
# =======================
function
(
add_custom_ie_build _inc _lib _lib_rel _lib_dbg _msg
)
if
(
NOT _inc OR
NOT
(
_lib OR _lib_rel OR _lib_dbg
))
return
()
...
...
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