Bläddra i källkod

OpenCL on Mac uses '-framework OpenCL' instead of libOpenCL.so, try to make that work (https://trac.osgeo.org/grass/ticket/1446)

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@56003 15284696-431f-4ddb-bdfa-cd5b030d7da7
Hamish Bowman 12 år sedan
förälder
incheckning
eb25f72c1e
2 ändrade filer med 745 tillägg och 673 borttagningar
  1. 730 663
      configure
  2. 15 10
      configure.in

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 730 - 663
configure


+ 15 - 10
configure.in

@@ -369,6 +369,7 @@ LOC_ARG_WITH_LIB(openmp, OpenMP)
 
 LOC_ARG_WITH_INC(opencl, OpenCL)
 LOC_ARG_WITH_LIB(opencl, OpenCL)
+#LOC_ARG_WITH_FRAMEWORK(opencl, OpenCL)
 
 # Put this early on so CPPFLAGS and LDFLAGS have any additional dirs
 
@@ -1768,19 +1769,23 @@ LOC_CHECK_INC_PATH(opencl,OpenCL,OCLINCPATH)
 
 if test -n "$MACOSX_APP" ; then
     LOC_CHECK_INCLUDES(OpenCL/opencl.h,OpenCL,$OCLINCPATH)
+
+    # With OpenCL library directory
+    ### FIXME: ###
+    #LOC_CHECK_FRAMEWORK_PATH(opencl,OpenCL,OPENCLPATH)
+    # last term in following would become ',$OPENCLPATH)' if above is uncommented
+    LOC_CHECK_FUNC(clGetPlatformInfo,OpenCL library,OCLLIB,-framework OpenCL,)
 else
     LOC_CHECK_INCLUDES(CL/cl.h,OpenCL,$OCLINCPATH)
-fi
-
-# With OpenCL library directory
 
-LOC_CHECK_LIB_PATH(opencl,OpenCL,OCLLIBPATH)
-
-LOC_CHECK_LIBS(OpenCL,clGetPlatformInfo,OpenCL,$OCLLIBPATH,OCLLIB,,,)
-# expanded symbol check: yes? no?
-#LOC_CHECK_FUNC(clGetPlatformInfo,OpenCL functions,OCLLIB,,,,,[
-#LOC_CHECK_LIBS(OpenCL,clGetPlatformInfo,OpenCL,$OCLLIBPATH,OCLLIB,,,)
-#])
+    # With OpenCL library directory
+    LOC_CHECK_LIB_PATH(opencl,OpenCL,OCLLIBPATH)
+    LOC_CHECK_LIBS(OpenCL,clGetPlatformInfo,OpenCL,$OCLLIBPATH,OCLLIB,,,)
+    # expanded symbol check: yes? no?
+    #LOC_CHECK_FUNC(clGetPlatformInfo,OpenCL functions,OCLLIB,,,,,[
+    #LOC_CHECK_LIBS(OpenCL,clGetPlatformInfo,OpenCL,$OCLLIBPATH,OCLLIB,,,)
+    #])
+fi
 
 fi # $USE_OPENCL