[Bf-blender-cvs] [9ade9d247d9] master: CMake: fix Cycles linking with OpenCL

Campbell Barton noreply at git.blender.org
Fri Apr 19 14:00:51 CEST 2019


Commit: 9ade9d247d90d348b0d84c3ef5644982de24e9ef
Author: Campbell Barton
Date:   Fri Apr 19 14:00:16 2019 +0200
Branches: master
https://developer.blender.org/rB9ade9d247d90d348b0d84c3ef5644982de24e9ef

CMake: fix Cycles linking with OpenCL

===================================================================

M	intern/cycles/app/CMakeLists.txt
M	intern/cycles/device/CMakeLists.txt

===================================================================

diff --git a/intern/cycles/app/CMakeLists.txt b/intern/cycles/app/CMakeLists.txt
index 36e3e179be5..d67a72ab7db 100644
--- a/intern/cycles/app/CMakeLists.txt
+++ b/intern/cycles/app/CMakeLists.txt
@@ -22,7 +22,6 @@ set(LIBRARIES
   ${ZLIB_LIBRARIES}
   ${TIFF_LIBRARY}
   ${PTHREADS_LIBRARIES}
-  extern_clew
 )
 
 if(WITH_CUDA_DYNLOAD)
diff --git a/intern/cycles/device/CMakeLists.txt b/intern/cycles/device/CMakeLists.txt
index 75f4a72bee3..3e14480e2ad 100644
--- a/intern/cycles/device/CMakeLists.txt
+++ b/intern/cycles/device/CMakeLists.txt
@@ -77,6 +77,9 @@ if(WITH_CYCLES_NETWORK)
   add_definitions(-DWITH_NETWORK)
 endif()
 if(WITH_CYCLES_DEVICE_OPENCL)
+  list(APPEND LIB
+    extern_clew
+  )
   add_definitions(-DWITH_OPENCL)
 endif()
 if(WITH_CYCLES_DEVICE_CUDA)



More information about the Bf-blender-cvs mailing list