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/kernel
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/kernel')
-rw-r--r--intern/cycles/kernel/CMakeLists.txt3
-rw-r--r--intern/cycles/kernel/osl/CMakeLists.txt2
2 files changed, 4 insertions, 1 deletions
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}")