From 02b33792cbffe47974a85ce0f33323caa3932a16 Mon Sep 17 00:00:00 2001 From: Andrey Kamaev Date: Tue, 4 Sep 2012 16:50:55 +0400 Subject: [PATCH] Fix precompiled headers support detection for gcc-4.6 toolchain from Android NDK r8b The version reported by toolchain is 4.6.x-google so regex needs an adjustment. --- cmake/OpenCVPCHSupport.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/OpenCVPCHSupport.cmake b/cmake/OpenCVPCHSupport.cmake index 16dbb06a9d..290dbd8f66 100644 --- 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-9x]") SET(PCHSupport_FOUND TRUE) ENDIF()