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
01c1b341
Commit
01c1b341
authored
Feb 03, 2020
by
Alexander Alekhin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cmake: enable C++11 implicitly
parent
bf2f7b0f
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
26 additions
and
25 deletions
+26
-25
OpenCVConfig.cmake.in
cmake/templates/OpenCVConfig.cmake.in
+26
-0
CMakeLists.example.in
samples/CMakeLists.example.in
+0
-5
CMakeLists.txt
samples/CMakeLists.txt
+0
-4
CMakeLists.txt
samples/android/face-detection/jni/CMakeLists.txt
+0
-4
CMakeLists.txt
...les/android/tutorial-2-mixedprocessing/jni/CMakeLists.txt
+0
-4
CMakeLists.txt
samples/android/tutorial-4-opencl/jni/CMakeLists.txt
+0
-4
CMakeLists.txt
samples/cpp/example_cmake/CMakeLists.txt
+0
-4
No files found.
cmake/templates/OpenCVConfig.cmake.in
View file @
01c1b341
...
@@ -273,6 +273,32 @@ endif()
...
@@ -273,6 +273,32 @@ endif()
# ==============================================================
# ==============================================================
set(OpenCV_LIBRARIES ${OpenCV_LIBS})
set(OpenCV_LIBRARIES ${OpenCV_LIBS})
# Require C++11 features for OpenCV modules
if(CMAKE_VERSION VERSION_LESS "3.1")
if(NOT OpenCV_FIND_QUIETLY AND NOT OPENCV_HIDE_WARNING_COMPILE_FEATURES)
message(STATUS "OpenCV: CMake version is low (${CMAKE_VERSION}, required 3.1+). Can't enable C++11 features: https://github.com/opencv/opencv/issues/13000")
endif()
else()
set(__target opencv_core)
if(TARGET opencv_world)
set(__target opencv_world)
endif()
set(__compile_features cxx_std_11) # CMake 3.8+
if(DEFINED OPENCV_COMPILE_FEATURES)
set(__compile_features ${OPENCV_COMPILE_FEATURES}) # custom override
elseif(CMAKE_VERSION VERSION_LESS "3.8")
set(__compile_features cxx_auto_type cxx_rvalue_references cxx_lambdas)
endif()
if(__compile_features)
# Simulate exported result of target_compile_features(opencv_core PUBLIC ...)
set_target_properties(${__target} PROPERTIES
INTERFACE_COMPILE_FEATURES "${__compile_features}"
)
endif()
unset(__target)
unset(__compile_features)
endif()
#
#
# Some macros for samples
# Some macros for samples
#
#
...
...
samples/CMakeLists.example.in
View file @
01c1b341
...
@@ -12,11 +12,6 @@ file(TO_CMAKE_PATH "${EXAMPLE_FILE}" EXAMPLE_FILE)
...
@@ -12,11 +12,6 @@ file(TO_CMAKE_PATH "${EXAMPLE_FILE}" EXAMPLE_FILE)
message(STATUS "Project: ${EXAMPLE_NAME}")
message(STATUS "Project: ${EXAMPLE_NAME}")
message(STATUS "File : ${EXAMPLE_FILE}")
message(STATUS "File : ${EXAMPLE_FILE}")
# Enable C++11
set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_STANDARD_REQUIRED TRUE)
# Define project name
# Define project name
project(${EXAMPLE_NAME})
project(${EXAMPLE_NAME})
...
...
samples/CMakeLists.txt
View file @
01c1b341
...
@@ -58,10 +58,6 @@ else()
...
@@ -58,10 +58,6 @@ else()
#===================================================================================================
#===================================================================================================
cmake_minimum_required
(
VERSION 3.1
)
cmake_minimum_required
(
VERSION 3.1
)
# Enable C++11
set
(
CMAKE_CXX_STANDARD 11
)
set
(
CMAKE_CXX_STANDARD_REQUIRED TRUE
)
project
(
samples C CXX
)
project
(
samples C CXX
)
option
(
BUILD_EXAMPLES
"Build samples"
ON
)
option
(
BUILD_EXAMPLES
"Build samples"
ON
)
...
...
samples/android/face-detection/jni/CMakeLists.txt
View file @
01c1b341
cmake_minimum_required
(
VERSION 3.6
)
cmake_minimum_required
(
VERSION 3.6
)
# Enable C++11
set
(
CMAKE_CXX_STANDARD 11
)
set
(
CMAKE_CXX_STANDARD_REQUIRED TRUE
)
set
(
target detection_based_tracker
)
set
(
target detection_based_tracker
)
project
(
${
target
}
CXX
)
project
(
${
target
}
CXX
)
...
...
samples/android/tutorial-2-mixedprocessing/jni/CMakeLists.txt
View file @
01c1b341
cmake_minimum_required
(
VERSION 3.6
)
cmake_minimum_required
(
VERSION 3.6
)
# Enable C++11
set
(
CMAKE_CXX_STANDARD 11
)
set
(
CMAKE_CXX_STANDARD_REQUIRED TRUE
)
set
(
target mixed_sample
)
set
(
target mixed_sample
)
project
(
${
target
}
CXX
)
project
(
${
target
}
CXX
)
...
...
samples/android/tutorial-4-opencl/jni/CMakeLists.txt
View file @
01c1b341
cmake_minimum_required
(
VERSION 3.6
)
cmake_minimum_required
(
VERSION 3.6
)
# Enable C++11
set
(
CMAKE_CXX_STANDARD 11
)
set
(
CMAKE_CXX_STANDARD_REQUIRED TRUE
)
set
(
target mixed_sample
)
set
(
target mixed_sample
)
project
(
${
target
}
CXX
)
project
(
${
target
}
CXX
)
...
...
samples/cpp/example_cmake/CMakeLists.txt
View file @
01c1b341
# cmake needs this line
# cmake needs this line
cmake_minimum_required
(
VERSION 3.1
)
cmake_minimum_required
(
VERSION 3.1
)
# Enable C++11
set
(
CMAKE_CXX_STANDARD 11
)
set
(
CMAKE_CXX_STANDARD_REQUIRED TRUE
)
# Define project name
# Define project name
project
(
opencv_example_project
)
project
(
opencv_example_project
)
...
...
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