[PATCH 114/144] do not build libllvmopencl.so by default, no longer used since 0.14

Gbp-Pq: Name 0114-do-not-build-libllvmopencl.so-by-default-no-longer-u.patch

diff --git a/CMakeLists.txt b/CMakeLists.txt
index db1439a92f46b073258b1df905a5225b543d200f..05314796d228b1480bc0ff9b3949ce39b9b95faf 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -343,7 +343,7 @@ endif()
 # for libpocl.so
 set(POCL_INSTALL_PUBLIC_LIBDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}" CACHE PATH "POCL public libdir")
 
-# for llvmopencl.so
+# for libpocl-devices-*.so
 set(POCL_INSTALL_PRIVATE_LIBDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/pocl" CACHE PATH "POCL private libdir")
 
 # for pocl.icd

diff --git a/lib/llvmopencl/CMakeLists.txt b/lib/llvmopencl/CMakeLists.txt
index c106b0f2d0d50dcdee333b70931b4a05b5f6b9b5..44211a1510c5972231f92a852fa8c4fd9179a796 100644 (file)
--- a/lib/llvmopencl/CMakeLists.txt
+++ b/lib/llvmopencl/CMakeLists.txt
@@ -101,6 +101,8 @@ endif(MSVC)
 add_library("llvmpasses" OBJECT ${LLVMPASSES_SOURCES})
 harden("llvmpasses")
 
+option(ENABLE_LIBLLVMOPENCL "Build separate libllvmopencl.so for use with 'opt'" OFF)
+if(ENABLE_LIBLLVMOPENCL)
 # This creates a separate llvmopencl.so that is loaded to 'opt'
 # for the pocl-workgroup version.
 #pkglib_LTLIBRARIES = llvmopencl.la
@@ -114,6 +116,7 @@ if(MSVC)
 endif(MSVC)
 
 #target_link_libraries("llvmopencl" "${LLVM_SYSLIBS}")
+endif(ENABLE_LIBLLVMOPENCL)
  
 # TODO cmake should handle this, i might me missing something …
 if(APPLE)
@@ -122,6 +125,7 @@ else()
   set(ADD_LD_FLAGS "-Wl,-export-dynamic")
 endif()
 
+if(ENABLE_LIBLLVMOPENCL)
 # TODO ENABLE_EXPORTS -> Wl,export_dynamic
 # https://www.cmake.org/cmake/help/v2.8.12/cmake.html#prop_tgt:ENABLE_EXPORTS
 # https://www.cmake.org/pipermail/cmake/2011-November/047708.html
@@ -136,8 +140,11 @@ install(TARGETS "llvmopencl"
         ARCHIVE DESTINATION ${POCL_INSTALL_PRIVATE_LIBDIR}/static
         COMPONENT "dev"
 )
+endif(ENABLE_LIBLLVMOPENCL)
 
 if(ENABLE_IPO)
   set_property(TARGET "llvmpasses" PROPERTY INTERPROCEDURAL_OPTIMIZATION TRUE)
+if(ENABLE_LIBLLVMOPENCL)
   set_property(TARGET "llvmopencl" PROPERTY INTERPROCEDURAL_OPTIMIZATION TRUE)
+endif(ENABLE_LIBLLVMOPENCL)
 endif()