[Cmake-commits] CMake branch, next, updated. v3.6.1-1139-g4e757ba

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  4e757ba79f569463d57ddbe327ab21882214db70 (commit)
       via  88f2455f04ace2b5b9bf4462344bcfb52fabc85e (commit)
      from  25bd0c3824b55ba10c23bc837ca28879487686bc (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4e757ba79f569463d57ddbe327ab21882214db70
commit 4e757ba79f569463d57ddbe327ab21882214db70
Merge: 25bd0c3 88f2455
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Aug 8 10:01:03 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Aug 8 10:01:03 2016 -0400

    Merge topic 'FindOpenCL-macOS' into next
    
    88f2455f FindOpenCL: Fix search on macOS.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=88f2455f04ace2b5b9bf4462344bcfb52fabc85e
commit 88f2455f04ace2b5b9bf4462344bcfb52fabc85e
Author:     Matthäus G. Chajdas <cmake at anteru.net>
AuthorDate: Sun Aug 7 19:38:35 2016 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Aug 8 09:57:30 2016 -0400

    FindOpenCL: Fix search on macOS.
    
    The original patch was provided by jerry <jerry.c.t at web.de>.

diff --git a/Modules/FindOpenCL.cmake b/Modules/FindOpenCL.cmake
index feda315..6acda55 100644
--- a/Modules/FindOpenCL.cmake
+++ b/Modules/FindOpenCL.cmake
@@ -53,7 +53,7 @@ function(_FIND_OPENCL_VERSION)
     if(APPLE)
       CHECK_SYMBOL_EXISTS(
         CL_VERSION_${VERSION}
-        "${OpenCL_INCLUDE_DIR}/OpenCL/cl.h"
+        "${OpenCL_INCLUDE_DIR}/Headers/cl.h"
         OPENCL_VERSION_${VERSION})
     else()
       CHECK_SYMBOL_EXISTS(
@@ -145,8 +145,15 @@ mark_as_advanced(
   OpenCL_LIBRARY)
 
 if(OpenCL_FOUND AND NOT TARGET OpenCL::OpenCL)
-  add_library(OpenCL::OpenCL UNKNOWN IMPORTED)
+  if(OpenCL_LIBRARY MATCHES "/([^/]+)\\.framework$")
+    add_library(OpenCL::OpenCL INTERFACE IMPORTED)
+    set_target_properties(OpenCL::OpenCL PROPERTIES
+      INTERFACE_LINK_LIBRARIES "${OpenCL_LIBRARY}")
+  else()
+    add_library(OpenCL::OpenCL UNKNOWN IMPORTED)
+    set_target_properties(OpenCL::OpenCL PROPERTIES
+      IMPORTED_LOCATION "${OpenCL_LIBRARY}")
+  endif()
   set_target_properties(OpenCL::OpenCL PROPERTIES
-    IMPORTED_LOCATION "${OpenCL_LIBRARY}"
     INTERFACE_INCLUDE_DIRECTORIES "${OpenCL_INCLUDE_DIRS}")
 endif()

-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake