projects
/
profile
/
ivi
/
opencv.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b0c7280
)
Fix precompiled headers support detection for gcc-4.6 toolchain from Android NDK r8b
author
Andrey Kamaev
<andrey.kamaev@itseez.com>
Tue, 4 Sep 2012 12:50:55 +0000
(16:50 +0400)
committer
Andrey Kamaev
<andrey.kamaev@itseez.com>
Tue, 4 Sep 2012 12:50:55 +0000
(16:50 +0400)
The version reported by toolchain is 4.6.x-google so regex needs an adjustment.
cmake/OpenCVPCHSupport.cmake
patch
|
blob
|
history
diff --git
a/cmake/OpenCVPCHSupport.cmake
b/cmake/OpenCVPCHSupport.cmake
index
16dbb06
..
290dbd8
100644
(file)
--- a/
cmake/OpenCVPCHSupport.cmake
+++ b/
cmake/OpenCVPCHSupport.cmake
@@
-19,7
+19,7
@@
IF(CMAKE_COMPILER_IS_GNUCXX)
ARGS ${CMAKE_CXX_COMPILER_ARG1} -dumpversion
OUTPUT_VARIABLE gcc_compiler_version)
#MESSAGE("GCC Version: ${gcc_compiler_version}")
- IF(gcc_compiler_version MATCHES "4\\.[0,2-9]\\.[0-9]")
+ IF(gcc_compiler_version MATCHES "4\\.[0,2-9]\\.[0-9
x
]")
SET(PCHSupport_FOUND TRUE)
ENDIF()