Commit 8df208cf authored by Andrey Kamaev's avatar Andrey Kamaev

Fixed compiler flags for 3rdparty libs.

parent 22d7e6b7
...@@ -282,6 +282,17 @@ else() ...@@ -282,6 +282,17 @@ else()
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()
# ---------------------------------------------------------------------------- # ----------------------------------------------------------------------------
# CHECK FOR SYSTEM LIBRARIES, OPTIONS, ETC.. # CHECK FOR SYSTEM LIBRARIES, OPTIONS, ETC..
# ---------------------------------------------------------------------------- # ----------------------------------------------------------------------------
...@@ -563,15 +574,6 @@ if(WIN32) ...@@ -563,15 +574,6 @@ if(WIN32)
endif() endif()
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: # Solution folders:
...@@ -584,6 +586,7 @@ endif() ...@@ -584,6 +586,7 @@ endif()
# Extra OpenCV targets: uninstall, package_source, perf, etc. # Extra OpenCV targets: uninstall, package_source, perf, etc.
include(cmake/OpenCVExtraTargets.cmake REQUIRED) include(cmake/OpenCVExtraTargets.cmake REQUIRED)
# ---------------------------------------------------------------------------- # ----------------------------------------------------------------------------
# Process subdirectories # Process subdirectories
# ---------------------------------------------------------------------------- # ----------------------------------------------------------------------------
...@@ -611,6 +614,7 @@ if(BUILD_EXAMPLES OR BUILD_ANDROID_EXAMPLES OR INSTALL_PYTHON_EXAMPLES) ...@@ -611,6 +614,7 @@ if(BUILD_EXAMPLES OR BUILD_ANDROID_EXAMPLES OR INSTALL_PYTHON_EXAMPLES)
add_subdirectory(samples) add_subdirectory(samples)
endif() endif()
# ---------------------------------------------------------------------------- # ----------------------------------------------------------------------------
# Finalization: generate configuration-based files # Finalization: generate configuration-based files
# ---------------------------------------------------------------------------- # ----------------------------------------------------------------------------
...@@ -628,6 +632,7 @@ include(cmake/OpenCVGenAndroidMK.cmake REQUIRED) ...@@ -628,6 +632,7 @@ include(cmake/OpenCVGenAndroidMK.cmake REQUIRED)
# Generate OpenCVСonfig.cmake and OpenCVConfig-version.cmake for cmake projects # Generate OpenCVСonfig.cmake and OpenCVConfig-version.cmake for cmake projects
include(cmake/OpenCVGenConfig.cmake REQUIRED) include(cmake/OpenCVGenConfig.cmake REQUIRED)
# ---------------------------------------------------------------------------- # ----------------------------------------------------------------------------
# Summary: # Summary:
# ---------------------------------------------------------------------------- # ----------------------------------------------------------------------------
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment