X-Git-Url: https://rtime.felk.cvut.cz/gitweb/opencv.git/blobdiff_plain/256e4ad711b4be4b7d175e5586f3835fc5d5ed32..41654194f6ca15beab5bbc31d1667e6801874ef9:/opencv/CMakeLists.txt

diff --git a/opencv/CMakeLists.txt b/opencv/CMakeLists.txt
index c8593828..01830f34 100644
--- a/opencv/CMakeLists.txt
+++ b/opencv/CMakeLists.txt
@@ -88,9 +88,9 @@ endif()
 # Default: dynamic libraries:
 SET(BUILD_SHARED_LIBS ON CACHE BOOL "Build shared libraries (.dll/.so) instead of static ones (.lib/.a)")
 IF(BUILD_SHARED_LIBS)
-	SET(OPENCV_BUILD_SHARED_LIB 1) # For cvconfig.h, etc.
+    SET(OPENCV_BUILD_SHARED_LIB 1) # For cvconfig.h, etc.
 ELSE(BUILD_SHARED_LIBS)
-	SET(OPENCV_BUILD_SHARED_LIB 0)
+    SET(OPENCV_BUILD_SHARED_LIB 0)
 ENDIF(BUILD_SHARED_LIBS)
 
 # ----------------------------------------------------------------------------
@@ -157,19 +157,19 @@ endif()
 #  the -fPIC flag should be used.
 # ----------------------------------------------------------------------------
 if(UNIX)
-	if  (__ICL)
-		set(CV_ICC   __ICL)
-	elseif(__ICC)
-		set(CV_ICC   __ICC)
-	elseif(__ECL)
-		set(CV_ICC   __ECL)
-	elseif(__ECC)
-		set(CV_ICC   __ECC)
-	elseif(__INTEL_COMPILER)
-		set(CV_ICC   __INTEL_COMPILER)
-	elseif(CMAKE_C_COMPILER MATCHES "icc")
-		set(CV_ICC   icc_matches_c_compiler)
-	endif()
+    if  (__ICL)
+        set(CV_ICC   __ICL)
+    elseif(__ICC)
+        set(CV_ICC   __ICC)
+    elseif(__ECL)
+        set(CV_ICC   __ECL)
+    elseif(__ECC)
+        set(CV_ICC   __ECC)
+    elseif(__INTEL_COMPILER)
+        set(CV_ICC   __INTEL_COMPILER)
+    elseif(CMAKE_C_COMPILER MATCHES "icc")
+        set(CV_ICC   icc_matches_c_compiler)
+    endif()
 endif()
 
 # ----------------------------------------------------------------------------
@@ -204,9 +204,9 @@ if(UNIX)
 endif()
 
 #if(MSVC)
-#	set(DEFAULT_ENABLE_OPENMP ON)
+#   set(DEFAULT_ENABLE_OPENMP ON)
 #else()
-#	set(DEFAULT_ENABLE_OPENMP OFF)
+#   set(DEFAULT_ENABLE_OPENMP OFF)
 #endif()
 #set(ENABLE_OPENMP ${DEFAULT_ENABLE_OPENMP} CACHE BOOL "")
 
@@ -264,19 +264,19 @@ set(WITH_TIFF ON CACHE BOOL "Include TIFF support")
 if(UNIX)
     set(WITH_FFMPEG ON CACHE BOOL "Include FFMPEG support")
     if(NOT APPLE)
-		set(WITH_UNICAP OFF CACHE BOOL "Include Unicap support (GPL)")
-    	set(WITH_GTK ON CACHE BOOL "Include GTK support")
-    	set(WITH_GSTREAMER ON CACHE BOOL "Include Gstreamer support")
-    	set(WITH_V4L ON CACHE BOOL "Include Video 4 Linux support")
-    	set(WITH_XINE OFF CACHE BOOL "Include Xine support (GPL)")
-	endif()
-	set(WITH_PVAPI ON CACHE BOOL "Include Prosilica GigE support")
-	set(WITH_1394 ON CACHE BOOL "Include IEEE1394 support")
+        set(WITH_UNICAP OFF CACHE BOOL "Include Unicap support (GPL)")
+        set(WITH_GTK ON CACHE BOOL "Include GTK support")
+        set(WITH_GSTREAMER ON CACHE BOOL "Include Gstreamer support")
+        set(WITH_V4L ON CACHE BOOL "Include Video 4 Linux support")
+        set(WITH_XINE OFF CACHE BOOL "Include Xine support (GPL)")
+    endif()
+    set(WITH_PVAPI ON CACHE BOOL "Include Prosilica GigE support")
+    set(WITH_1394 ON CACHE BOOL "Include IEEE1394 support")
 endif()
 
 if(APPLE)
-	set(WITH_CARBON OFF CACHE BOOL "Use Carbon for UI instead of Cocoa")
-	set(WITH_QUICKTIME OFF CACHE BOOL "Use QuickTime for Video I/O insted of QTKit")
+    set(WITH_CARBON OFF CACHE BOOL "Use Carbon for UI instead of Cocoa")
+    set(WITH_QUICKTIME OFF CACHE BOOL "Use QuickTime for Video I/O insted of QTKit")
 endif()
 
 set(WITH_TBB OFF CACHE BOOL "Include TBB support")
@@ -731,11 +731,11 @@ endif()
 
 if(CMAKE_COMPILER_IS_GNUCXX)
 
-	if(WIN32)
-		if(CMAKE_CXX_COMPILER MATCHES "64")
-			set(MINGW64 1)
-		endif()
-	endif()
+    if(WIN32)
+        if(CMAKE_CXX_COMPILER MATCHES "64")
+            set(MINGW64 1)
+        endif()
+    endif()
 
     # High level of warnings.
     set(EXTRA_C_FLAGS "${EXTRA_C_FLAGS} -Wall")
@@ -757,13 +757,13 @@ if(CMAKE_COMPILER_IS_GNUCXX)
         set(EXTRA_C_FLAGS "${EXTRA_C_FLAGS} -Werror")
     endif()
 
-	if(X86)
+    if(X86)
         if(NOT X86_64)
             if(NOT APPLE)
                 set(EXTRA_C_FLAGS "${EXTRA_C_FLAGS} -march=i686")
             endif()
         endif()
-	endif()
+    endif()
 
     # Other optimizations
     if(USE_OMIT_FRAME_POINTER)
@@ -835,11 +835,11 @@ endif()
 
 # Extra link libs if the user selects building static libs:
 IF(NOT BUILD_SHARED_LIBS)
-	if(CMAKE_COMPILER_IS_GNUCXX)
-		set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} stdc++)
-	endif()
+    if(CMAKE_COMPILER_IS_GNUCXX)
+        set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} stdc++)
+    endif()
 
-	set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} flann zlib opencv_lapack)
+    set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} flann zlib opencv_lapack)
 endif()
 
 
@@ -1114,7 +1114,7 @@ else()
 message(STATUS "  GUI Back-end:                Cocoa")
 endif()
 message(STATUS "")
-endif()	
+endif() 
 
 message(STATUS "  Image I/O: ")
 if(NOT WITH_JPEG OR JPEG_FOUND)
@@ -1123,7 +1123,7 @@ else()
 message(STATUS "    JPEG:                      build")
 endif()
 
-if(NOT WIDTH_PNG OR PNG_FOUND)
+if(NOT WITH_PNG OR PNG_FOUND)
 message(STATUS "    PNG:                       ${PNG_FOUND}")
 else()
 message(STATUS "    PNG:                       build")