Make it possible to build on Mac without using configure

It is easier to use QtCreator with QtOpenCL if the opencl.pro
file can be opened directly.

5 files changed, 16 insertions, 6 deletions

diff --git a/configure b/configure
index 693b748..6196570 100755
--- a/configure
+++ b/configure
@@ -514,6 +514,7 @@ if [ "x$CFG_GCOV" = "xyes" ] ; then
     QMAKE_OPTIONS="$QMAKE_OPTIONS QMAKE_CXXFLAGS*=-ftest-coverage"
     QMAKE_OPTIONS="$QMAKE_OPTIONS CONFIG+=gcov"
 fi
+QMAKE_OPTIONS="$QMAKE_OPTIONS CONFIG+=opencl_configure"
 
 if $OPT_QMAKE $QMAKE_OPTIONS \
         "LIBS*=$L_FLAGS" \
diff --git a/src/opencl/opencl.pro b/src/opencl/opencl.pro
index 7258b4b..67ca673 100644
--- a/src/opencl/opencl.pro
+++ b/src/opencl/opencl.pro
@@ -26,6 +26,10 @@ win32 {
     }
 }
 
+macx:!opencl_configure {
+    LIBS += -framework OpenCL
+}
+
 HEADERS += \
     qclbuffer.h \
     qclcommandqueue.h \
diff --git a/src/opencl/opencl_dep.pri b/src/opencl/opencl_dep.pri
index 6860733..9ea2bda 100644
--- a/src/opencl/opencl_dep.pri
+++ b/src/opencl/opencl_dep.pri
@@ -1,6 +1,9 @@
 INCLUDEPATH += $$PWD
+LIBS += -lQtOpenCL
+macx:!opencl_configure {
+    LIBS += -framework OpenCL
+}
 win32 {
-    LIBS += -lQtOpenCL
     !isEmpty(QMAKE_INCDIR_OPENCL) {
         QMAKE_CXXFLAGS += -I$$QMAKE_INCDIR_OPENCL
     }
@@ -12,6 +15,4 @@ win32 {
     } else {
         LIBS += -lOpenCL
     }
-} else {
-    LIBS += -lQtOpenCL
 }
diff --git a/src/openclgl/openclgl.pro b/src/openclgl/openclgl.pro
index 0b50ba3..fe5a376 100644
--- a/src/openclgl/openclgl.pro
+++ b/src/openclgl/openclgl.pro
@@ -30,6 +30,9 @@ win32 {
 } else {
     LIBS += -lQtOpenCL
 }
+macx:!opencl_configure {
+    LIBS += -framework OpenCL
+}
 
 no_cl_gl {
     DEFINES += QT_NO_CL_OPENGL
diff --git a/src/openclgl/openclgl_dep.pri b/src/openclgl/openclgl_dep.pri
index 1d7599e..e3e58f9 100644
--- a/src/openclgl/openclgl_dep.pri
+++ b/src/openclgl/openclgl_dep.pri
@@ -1,6 +1,9 @@
 INCLUDEPATH += $$PWD $$PWD/../opencl
+LIBS += -lQtOpenCLGL -lQtOpenCL
+macx:!opencl_configure {
+    LIBS += -framework OpenCL
+}
 win32 {
-    LIBS += -lQtOpenCLGL -lQtOpenCL
     !isEmpty(QMAKE_INCDIR_OPENCL) {
         QMAKE_CXXFLAGS += -I$$QMAKE_INCDIR_OPENCL
     }
@@ -12,8 +15,6 @@ win32 {
     } else {
         LIBS += -lOpenCL
     }
-} else {
-    LIBS += -lQtOpenCLGL -lQtOpenCL
 }
 QT += opengl
 no_cl_gl {