Merge branch 'blender2.7'
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Sun, 27 Jan 2019 19:17:11 +0000 (20:17 +0100)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Sun, 27 Jan 2019 19:17:11 +0000 (20:17 +0100)
intern/cycles/app/CMakeLists.txt
intern/cycles/util/CMakeLists.txt

index f6052dcb275e57c55f25f29a4e89617c9a5dddb4..554c3c263aefb6e16296ab77e316a6e933e4ec29 100644 (file)
@@ -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)
index 42626d05cf96ad951fb62703ea9130f0ab04e891..16abed142b2c5ba79f596df8520ff21a40b36729 100644 (file)
@@ -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)