[Cmake-commits] CMake branch, next, updated. v3.6.1-1134-g8c38d8e

[Matthaus G. Chajdas]

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  8c38d8ed5f41f8b57e94b1e9dff923462f992d87 (commit)
       via  48dc6343bba3b3f296d35ab060681c50f0eb8cde (commit)
       via  5a8b67b3de0e09abf5104bbf68e5eb4e74d34786 (commit)
       via  6da5fb8379dd1ced9a39c51c534e0252da111950 (commit)
      from  435e2ab79c7f293254eab39a5a4150883e9066ca (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=8c38d8ed5f41f8b57e94b1e9dff923462f992d87
commit 8c38d8ed5f41f8b57e94b1e9dff923462f992d87
Merge: 435e2ab 48dc634
Author:     Matthaus G. Chajdas <cmake at anteru.net>
AuthorDate: Sun Aug 7 13:43:39 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Aug 7 13:43:39 2016 -0400

    Merge topic 'fix-findopencl-on-mac-os' into next
    
    48dc6343 Fix search for OpenCL on macOS.
    5a8b67b3 CMake Nightly Date Stamp
    6da5fb83 CMake Nightly Date Stamp


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=48dc6343bba3b3f296d35ab060681c50f0eb8cde
commit 48dc6343bba3b3f296d35ab060681c50f0eb8cde
Author:     Matthäus G. Chajdas <cmake at anteru.net>
AuthorDate: Sun Aug 7 19:38:35 2016 +0200
Commit:     Matthäus G. Chajdas <cmake at anteru.net>
CommitDate: Sun Aug 7 19:42:46 2016 +0200

    Fix search for OpenCL 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:
 Modules/FindOpenCL.cmake  |   13 ++++++++++---
 Source/CMakeVersion.cmake |    2 +-
 2 files changed, 11 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake