diff options
| author | Michael Meeks <michael.meeks@suse.com> | 2013-06-13 21:36:53 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2013-06-17 13:35:35 +0100 |
| commit | 55bead4bb502b8fef9485f0e31055cc546e652bb (patch) | |
| tree | efd12e244570004f56373b34039e11e5a04e59d9 | |
| parent | 3a183e87421fdef3e8f7e7459d539ab28a6a2241 (diff) | |
initial opencl configure pieces.
Change-Id: I5592fdab8f6029e371b3d70f3334b737a6262eac
| -rw-r--r-- | config_host.mk.in | 3 | ||||
| -rw-r--r-- | configure.ac | 34 |
2 files changed, 37 insertions, 0 deletions
diff --git a/config_host.mk.in b/config_host.mk.in index e7b541d53d22..3a10c3b642ba 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -139,6 +139,7 @@ export ENABLE_NPAPI_FROM_BROWSER=@ENABLE_NPAPI_FROM_BROWSER@ export ENABLE_NPAPI_INTO_BROWSER=@ENABLE_NPAPI_INTO_BROWSER@ export ENABLE_ONLINE_UPDATE=@ENABLE_ONLINE_UPDATE@ export ENABLE_OPENGL=@ENABLE_OPENGL@ +export ENABLE_OPENCL=@ENABLE_OPENCL@ export ENABLE_PACKAGEKIT=@ENABLE_PACKAGEKIT@ export ENABLE_PCH=@ENABLE_PCH@ export ENABLE_PDFIMPORT=@ENABLE_PDFIMPORT@ @@ -378,6 +379,8 @@ export OOOP_SAMPLES_PACK=@OOOP_SAMPLES_PACK@ export OOOP_TEMPLATES_PACK=@OOOP_TEMPLATES_PACK@ export OOO_JUNIT_JAR=@OOO_JUNIT_JAR@ export OOO_VENDOR=@OOO_VENDOR@ +export OPENCL_CFLAGS=$(gb_SPACE)@OPENCL_CFLAGS@ +export OPENCL_LIBS=$(gb_SPACE)@OPENCL_LIBS@ export OPENSSL_CFLAGS=$(gb_SPACE)@OPENSSL_CFLAGS@ export OPENSSL_LIBS=$(gb_SPACE)@OPENSSL_LIBS@ export ORCUS_CFLAGS=$(gb_SPACE)@ORCUS_CFLAGS@ diff --git a/configure.ac b/configure.ac index 6b5168778233..c4529f607784 100644 --- a/configure.ac +++ b/configure.ac @@ -1754,6 +1754,16 @@ AC_ARG_WITH(windows-sdk, ], ,) +AC_ARG_WITH(opencl-sdk, + AS_HELP_STRING([--with-opencl-sdk], + [If you have the AMD HSA / opencl SDK installed (cf. + http://developer.amd.com/tools-and-sdks/heterogeneous-computing/amd-accelerated-parallel-processing-app-sdk/downloads/ ) + Pass the absolute path to where that SDK is unpacked.]) + [ + Usage: --with-opencl-sdk=/opt/AMDAPP + ], +,) + AC_ARG_WITH(lang, AS_HELP_STRING([--with-lang], [Use this option to build LibreOffice with additional language support. @@ -9733,6 +9743,30 @@ fi AC_SUBST(SYSTEM_MESA_HEADERS) AC_SUBST(ENABLE_OPENGL) +dnl ================================================= +dnl Check whether the OpenCL libraries are available +dnl ================================================= + +OPENCL_LIBS= +OPENCL_CFLAGS= +ENABLE_OPENCL= +AC_MSG_CHECKING([opencl sdk]) +if test "z$with_opencl_sdk" = "z"; then + AC_MSG_RESULT([no]) +else + if test -d $with_opencl_sdk/include; then + ENABLE_OPENCL=TRUE + OPENCL_CFLAGS="-I $with_opencl_sdk/include" + OPENCL_LIBS="-L $with_opencl_sdk/lib/x86 -lOpenCL" + AC_MSG_RESULT([found at path $with_opencl_sdk]) + else + AC_MSG_ERROR([no headers found found at $with_opencl_sdk/include ]) + fi +fi +AC_SUBST(OPENCL_CFLAGS) +AC_SUBST(OPENCL_LIBS) +AC_SUBST(ENABLE_OPENCL) + # presenter minimizer extension? AC_MSG_CHECKING([whether to build the Presentation Minimizer extension]) if test "x$enable_ext_presenter_minimizer" != "xno" -a "x$enable_extension_integration" != "xno"; then |