diff options
Diffstat (limited to 'intern/cycles/util/CMakeLists.txt')
| -rw-r--r-- | intern/cycles/util/CMakeLists.txt | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/intern/cycles/util/CMakeLists.txt b/intern/cycles/util/CMakeLists.txt index 842d5efac79..0acb9e9304c 100644 --- a/intern/cycles/util/CMakeLists.txt +++ b/intern/cycles/util/CMakeLists.txt @@ -5,12 +5,12 @@ set(INC ) set(INC_SYS - ${GLEW_INCLUDE_PATH} + ${GLEW_INCLUDE_DIR} ) set(SRC + util_aligned_malloc.cpp util_cache.cpp - util_dynlib.cpp util_logging.cpp util_md5.cpp util_path.cpp @@ -22,6 +22,10 @@ set(SRC util_transform.cpp ) +if(NOT CYCLES_STANDALONE_REPOSITORY) + add_definitions(-DWITH_GLEW_MX) +endif() + if(WITH_CYCLES_STANDALONE AND WITH_CYCLES_STANDALONE_GUI) list(APPEND SRC util_view.cpp @@ -30,11 +34,12 @@ endif() set(SRC_HEADERS util_algorithm.h + util_aligned_malloc.h util_args.h + util_atomic.h util_boundbox.h util_cache.h util_debug.h - util_dynlib.h util_foreach.h util_function.h util_half.h @@ -44,6 +49,7 @@ set(SRC_HEADERS util_logging.h util_map.h util_math.h + util_math_fast.h util_md5.h util_opengl.h util_optimization.h @@ -68,6 +74,15 @@ set(SRC_HEADERS util_xml.h ) +if(WITH_CYCLES_DEBUG) + list(APPEND SRC + util_guarded_allocator.cpp + ) + list(APPEND SRC_HEADERS + util_guarded_allocator.h + ) +endif() + include_directories(${INC}) include_directories(SYSTEM ${INC_SYS}) |