diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-02-04 02:46:34 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-02-04 02:46:34 +0300 |
commit | eeb621566af3c6737393d87ef33237fc96d06d87 (patch) | |
tree | 36a4d1bd54142368148fb3a82c932f874c011fc1 /intern/cycles/render | |
parent | 1bc0cd00713a573bed76ab35b6ae0cc0e9edc307 (diff) | |
parent | 36c1122b96ca550a541f9cea9ed2673319c7467b (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern/cycles/render')
-rw-r--r-- | intern/cycles/render/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/render/CMakeLists.txt b/intern/cycles/render/CMakeLists.txt index 17ac66644e2..580d76e7777 100644 --- a/intern/cycles/render/CMakeLists.txt +++ b/intern/cycles/render/CMakeLists.txt @@ -71,4 +71,4 @@ include_directories(SYSTEM ${INC_SYS}) add_definitions(${GL_DEFINITIONS}) -add_library(cycles_render ${SRC} ${SRC_HEADERS}) +cycles_add_library(cycles_render ${SRC} ${SRC_HEADERS}) |