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
8df208cf
Commit
8df208cf
authored
Feb 24, 2012
by
Andrey Kamaev
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed compiler flags for 3rdparty libs.
parent
22d7e6b7
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
9 deletions
+14
-9
CMakeLists.txt
CMakeLists.txt
+14
-9
No files found.
CMakeLists.txt
View file @
8df208cf
...
...
@@ -282,6 +282,17 @@ else()
endif
()
# ----------------------------------------------------------------------------
# OpenCV compiler and linker options
# ----------------------------------------------------------------------------
include
(
cmake/OpenCVCompilerOptions.cmake REQUIRED
)
# In case of Makefiles if the user does not setup CMAKE_BUILD_TYPE, assume it's Release:
if
(
CMAKE_GENERATOR MATCHES
"Makefiles"
AND
"
${
CMAKE_BUILD_TYPE
}
"
STREQUAL
""
)
set
(
CMAKE_BUILD_TYPE Release
)
endif
()
# ----------------------------------------------------------------------------
# CHECK FOR SYSTEM LIBRARIES, OPTIONS, ETC..
# ----------------------------------------------------------------------------
...
...
@@ -563,15 +574,6 @@ if(WIN32)
endif
()
endif
()
# ----------------------------------------------------------------------------
# OpenCV compiler and linker options
# ----------------------------------------------------------------------------
include
(
cmake/OpenCVCompilerOptions.cmake REQUIRED
)
# In case of Makefiles if the user does not setup CMAKE_BUILD_TYPE, assume it's Release:
if
(
CMAKE_GENERATOR MATCHES
"Makefiles"
AND
"
${
CMAKE_BUILD_TYPE
}
"
STREQUAL
""
)
set
(
CMAKE_BUILD_TYPE Release
)
endif
()
# ----------------------------------------------------------------------------
# Solution folders:
...
...
@@ -584,6 +586,7 @@ endif()
# Extra OpenCV targets: uninstall, package_source, perf, etc.
include
(
cmake/OpenCVExtraTargets.cmake REQUIRED
)
# ----------------------------------------------------------------------------
# Process subdirectories
# ----------------------------------------------------------------------------
...
...
@@ -611,6 +614,7 @@ if(BUILD_EXAMPLES OR BUILD_ANDROID_EXAMPLES OR INSTALL_PYTHON_EXAMPLES)
add_subdirectory
(
samples
)
endif
()
# ----------------------------------------------------------------------------
# Finalization: generate configuration-based files
# ----------------------------------------------------------------------------
...
...
@@ -628,6 +632,7 @@ include(cmake/OpenCVGenAndroidMK.cmake REQUIRED)
# Generate OpenCVСonfig.cmake and OpenCVConfig-version.cmake for cmake projects
include
(
cmake/OpenCVGenConfig.cmake REQUIRED
)
# ----------------------------------------------------------------------------
# Summary:
# ----------------------------------------------------------------------------
...
...
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