From: Andrey Kamaev <no@email>
Date: Fri, 24 Feb 2012 21:54:29 +0000 (+0000)
Subject: Fixed compiler flags for 3rdparty libs.
X-Git-Tag: accepted/tizen/6.0/unified/20201030.111113~5463
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8df208cf56f513ff283e137d25d05f3c91853e17;p=platform%2Fupstream%2Fopencv.git

Fixed compiler flags for 3rdparty libs.
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9c9ef0e..8626340 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -283,6 +283,17 @@ 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..
 # ----------------------------------------------------------------------------
 if(UNIX)
@@ -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:
 # ----------------------------------------------------------------------------