瀏覽代碼

SOCL: install vendors file in @datarootdir@/starpu/opencl/vendors

Nathalie Furmento 12 年之前
父節點
當前提交
9353bae638
共有 3 個文件被更改,包括 8 次插入0 次删除
  1. 4 0
      configure.ac
  2. 3 0
      socl/Makefile.am
  3. 1 0
      socl/vendors/install/socl.icd.in

+ 4 - 0
configure.ac

@@ -2197,14 +2197,17 @@ AC_CONFIG_COMMANDS([executable-scripts], [
 
 # Create links to ICD files in build/socl/vendors directory. SOCL will use this
 # directory as the OCL_ICD_VENDORS directory
+SOCL_VENDORS="vendors/install/socl.icd"
 for icd in /etc/OpenCL/vendors/*.icd ; do
 	if test -f $icd ; then
 	        if test "$(basename $icd)" != "socl.icd" ; then
         		new_icd=$(basename $icd)
 			AC_CONFIG_LINKS([socl/vendors/$new_icd:$icd])
+			SOCL_VENDORS="$SOCL_VENDORS vendors/$new_icd"
 		fi
         fi
 done
+AC_SUBST(SOCL_VENDORS)
 
 AC_CONFIG_FILES(tests/regression/regression.sh tests/regression/profiles tests/regression/profiles.build.only)
 AC_CONFIG_HEADER(src/common/config.h include/starpu_config.h gcc-plugin/include/starpu-gcc/config.h starpu-top/config.h)
@@ -2220,6 +2223,7 @@ AC_OUTPUT([
 	socl/src/Makefile
 	socl/examples/Makefile
 	socl/vendors/socl.icd
+	socl/vendors/install/socl.icd
 	libstarpu.pc
 	starpu-1.0.pc
 	starpu-1.1.pc

+ 3 - 0
socl/Makefile.am

@@ -17,6 +17,9 @@ SUBDIRS = src examples
 
 EXTRA_DIST = README
 
+SOCL_vendorsdir = @datarootdir@/starpu/opencl/vendors
+dist_SOCL_vendors_DATA = @SOCL_VENDORS@
+
 showcheck:
 	for i in $(SUBDIRS) ; do \
 		make -C $$i showcheck ; \

+ 1 - 0
socl/vendors/install/socl.icd.in

@@ -0,0 +1 @@
+@prefix@/lib/libsocl-@STARPU_EFFECTIVE_VERSION@.so