diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-01-27 22:17:11 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-01-27 22:17:11 +0300 |
| commit | 690478027bd795bdbfa55d77987fec6f83c7d03a (patch) | |
| tree | 8edfce541f4f22db676a80ee14a5944186d75f01 /intern | |
| parent | d97df138d1ab965a39973366810952979d164665 (diff) | |
| parent | d377cd5db19a2c14a4d7ee7ba9986319d49497fa (diff) | |
Merge branch 'blender2.7'
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/app/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | intern/cycles/util/CMakeLists.txt | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/intern/cycles/app/CMakeLists.txt b/intern/cycles/app/CMakeLists.txt index f6052dcb275..554c3c263ae 100644 --- a/intern/cycles/app/CMakeLists.txt +++ b/intern/cycles/app/CMakeLists.txt @@ -36,7 +36,7 @@ if(WITH_CYCLES_OSL) endif() if(NOT CYCLES_STANDALONE_REPOSITORY) - list(APPEND LIBRARIES bf_intern_glew_mx bf_intern_guardedalloc) + list(APPEND LIBRARIES bf_intern_glew_mx bf_intern_guardedalloc bf_intern_numaapi) endif() if(WITH_CYCLES_LOGGING) diff --git a/intern/cycles/util/CMakeLists.txt b/intern/cycles/util/CMakeLists.txt index 42626d05cf9..16abed142b2 100644 --- a/intern/cycles/util/CMakeLists.txt +++ b/intern/cycles/util/CMakeLists.txt @@ -33,6 +33,9 @@ if(WITH_CYCLES_STANDALONE) util_view.cpp ) endif() +endif() + +if(CYCLES_STANDALONE_REPOSITORY) list(APPEND INC_SYS ../../third_party/numaapi/include) else() list(APPEND INC_SYS ../../numaapi/include) |