projects
/
platform
/
upstream
/
opencv.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4f7a8f6
)
removed duplicated compiler flags assignment
author
Andrey Kamaev
<no@email>
Tue, 5 Jul 2011 06:42:56 +0000
(06:42 +0000)
committer
Andrey Kamaev
<no@email>
Tue, 5 Jul 2011 06:42:56 +0000
(06:42 +0000)
CMakeLists.txt
patch
|
blob
|
history
OpenCVConfig.cmake.in
patch
|
blob
|
history
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index
8ef695d
..
a65ab68
100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-59,12
+59,6
@@
if(CMAKE_VERBOSE)
set(CMAKE_VERBOSE_MAKEFILE 1)
endif()
-if (WIN32)
- if(${CMAKE_GENERATOR} MATCHES "(MinGW)|(MSYS)")
- set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG" CACHE STRING "")
- endif()
-endif()
-
# --------------------------------------------------------------
# Indicate CMake 2.7 and above that we don't want to mix relative
# and absolute paths in linker lib lists.
diff --git
a/OpenCVConfig.cmake.in
b/OpenCVConfig.cmake.in
index
50dfb13
..
094cf37
100644
(file)
--- a/
OpenCVConfig.cmake.in
+++ b/
OpenCVConfig.cmake.in
@@
-155,7
+155,7
@@
IF (OpenCV_HAVE_ANDROID_CAMERA)
)
\r
endforeach()
\r
endmacro()
\r
-ENDIF(
ANDROID
)
\r
+ENDIF()
\r
\r
# ======================================================
\r
# Version variables:
\r