Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2019-04-16 07:18:52 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-04-16 07:20:52 +0300
commit5498e7f193e2399b8693ef17803f864103307b4b (patch)
treec72b53e0d0f3fe1e5f4706c207917a7cbcaa18d7 /intern/cycles
parent813e470eac309a78d1f8cdc4a3abb0314b0ee5f3 (diff)
CMake: add library deps to CMakeLists.txt
Tested to work on Linux and macOS. This will be enabled once all platforms are verified. See D4684
Diffstat (limited to 'intern/cycles')
-rw-r--r--intern/cycles/blender/CMakeLists.txt7
-rw-r--r--intern/cycles/bvh/CMakeLists.txt2
-rw-r--r--intern/cycles/device/CMakeLists.txt10
-rw-r--r--intern/cycles/kernel/CMakeLists.txt3
-rw-r--r--intern/cycles/kernel/osl/CMakeLists.txt2
-rw-r--r--intern/cycles/render/CMakeLists.txt7
6 files changed, 29 insertions, 2 deletions
diff --git a/intern/cycles/blender/CMakeLists.txt b/intern/cycles/blender/CMakeLists.txt
index 3f8868d793b..ccbe20b28a8 100644
--- a/intern/cycles/blender/CMakeLists.txt
+++ b/intern/cycles/blender/CMakeLists.txt
@@ -39,6 +39,13 @@ set(SRC
)
set(LIB
+ cycles_bvh
+ cycles_device
+ cycles_graph
+ cycles_kernel
+ cycles_render
+ cycles_subd
+ cycles_util
)
set(ADDON_FILES
diff --git a/intern/cycles/bvh/CMakeLists.txt b/intern/cycles/bvh/CMakeLists.txt
index 52f4138432b..ea31838d816 100644
--- a/intern/cycles/bvh/CMakeLists.txt
+++ b/intern/cycles/bvh/CMakeLists.txt
@@ -36,7 +36,7 @@ set(SRC_HEADERS
)
set(LIB
-
+ cycles_render
)
include_directories(${INC})
diff --git a/intern/cycles/device/CMakeLists.txt b/intern/cycles/device/CMakeLists.txt
index f0f0390c29b..d804a07bcab 100644
--- a/intern/cycles/device/CMakeLists.txt
+++ b/intern/cycles/device/CMakeLists.txt
@@ -62,6 +62,16 @@ set(LIB
)
+if(WITH_CUDA_DYNLOAD)
+ list(APPEND LIB
+ extern_cuew
+ )
+else()
+ list(APPEND LIB
+ ${CUDA_CUDA_LIBRARY}
+ )
+endif()
+
add_definitions(${GL_DEFINITIONS})
if(WITH_CYCLES_NETWORK)
add_definitions(-DWITH_NETWORK)
diff --git a/intern/cycles/kernel/CMakeLists.txt b/intern/cycles/kernel/CMakeLists.txt
index cbb69962781..01552dff9bb 100644
--- a/intern/cycles/kernel/CMakeLists.txt
+++ b/intern/cycles/kernel/CMakeLists.txt
@@ -474,6 +474,9 @@ endif()
# OSL module
if(WITH_CYCLES_OSL)
+ list(APPEND LIB
+ cycles_kernel_osl
+ )
add_subdirectory(osl)
add_subdirectory(shaders)
endif()
diff --git a/intern/cycles/kernel/osl/CMakeLists.txt b/intern/cycles/kernel/osl/CMakeLists.txt
index 804610bdc10..0a3d0b974cb 100644
--- a/intern/cycles/kernel/osl/CMakeLists.txt
+++ b/intern/cycles/kernel/osl/CMakeLists.txt
@@ -26,7 +26,7 @@ set(HEADER_SRC
)
set(LIB
-
+ cycles_render
)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${RTTI_DISABLE_FLAGS}")
diff --git a/intern/cycles/render/CMakeLists.txt b/intern/cycles/render/CMakeLists.txt
index af0f8b806a8..140fcb206dc 100644
--- a/intern/cycles/render/CMakeLists.txt
+++ b/intern/cycles/render/CMakeLists.txt
@@ -74,8 +74,15 @@ set(SRC_HEADERS
)
set(LIB
+ cycles_bvh
)
+if(WITH_CYCLES_OSL)
+ list(APPEND LIB
+ cycles_kernel_osl
+ )
+endif()
+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${RTTI_DISABLE_FLAGS}")
include_directories(${INC})