diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2019-10-28 17:38:34 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2019-10-28 17:38:34 +0300 |
| commit | d310cbfa0fd0c424addf3f10c215869b790e3214 (patch) | |
| tree | 9ce256b1ef726fb5c93876cc085cc47b9f13e386 /intern/cycles/util | |
| parent | 1bde6c04f97e32f417b29c7d9f69a390234086ee (diff) | |
| parent | 312075e6883986fe2d1861811c7255b8898ab2cc (diff) | |
Merge branch 'blender-v2.81-release'
Diffstat (limited to 'intern/cycles/util')
| -rw-r--r-- | intern/cycles/util/CMakeLists.txt | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/intern/cycles/util/CMakeLists.txt b/intern/cycles/util/CMakeLists.txt index a6a6b6704f0..0063422aaef 100644 --- a/intern/cycles/util/CMakeLists.txt +++ b/intern/cycles/util/CMakeLists.txt @@ -41,9 +41,13 @@ if(WITH_CYCLES_STANDALONE) endif() if(CYCLES_STANDALONE_REPOSITORY) - list(APPEND INC_SYS ../../third_party/numaapi/include) + list(APPEND INC_SYS + ../../third_party/numaapi/include + ) else() - list(APPEND INC_SYS ../../numaapi/include) + list(APPEND INC_SYS + ../../numaapi/include + ) endif() set(SRC_HEADERS @@ -119,7 +123,7 @@ set(SRC_HEADERS util_types_float4_impl.h util_types_float8.h util_types_float8_impl.h - util_types_int2.h + util_types_int2.h util_types_int2_impl.h util_types_int3.h util_types_int3_impl.h @@ -140,6 +144,7 @@ set(SRC_HEADERS util_types_ushort4.h util_types_vector3.h util_types_vector3_impl.h + util_unique_ptr.h util_vector.h util_version.h util_view.h |