[opencv] 120/251: cmake: fix build with CMake 3.9.0

Nobuhiro Iwamatsu iwamatsu at moszumanska.debian.org
Sun Aug 27 23:27:33 UTC 2017


This is an automated email from the git hooks/post-receive script.

iwamatsu pushed a commit to annotated tag 3.3.0
in repository opencv.

commit 22f12dc93c1b8c4e0c5aa8a945669c3fe2dfce3c
Author: Alexander Alekhin <alexander.alekhin at intel.com>
Date:   Thu Jul 20 14:49:37 2017 +0300

    cmake: fix build with CMake 3.9.0
---
 cmake/OpenCVPCHSupport.cmake | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/cmake/OpenCVPCHSupport.cmake b/cmake/OpenCVPCHSupport.cmake
index 8a6c5c4..12e804d 100644
--- a/cmake/OpenCVPCHSupport.cmake
+++ b/cmake/OpenCVPCHSupport.cmake
@@ -323,10 +323,7 @@ MACRO(ADD_NATIVE_PRECOMPILED_HEADER _targetName _input)
 
         get_target_property(_sources ${_targetName} SOURCES)
         foreach(src ${_sources})
-          if(NOT "${src}" MATCHES "\\.mm$"
-               AND NOT "${src}" MATCHES "\\.h$" AND NOT "${src}" MATCHES "\\.hpp$" # header files
-               AND NOT "${src}" MATCHES "^\$" # CMake generator expressions
-          )
+          if("${src}" MATCHES "\\.c(pp|xx)?$")
             get_source_file_property(oldProps "${src}" COMPILE_FLAGS)
             get_source_file_property(oldProps2 "${src}" COMPILE_DEFINITIONS)
             if(NOT oldProps AND NOT oldProps2)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/opencv.git



More information about the debian-science-commits mailing list