diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-03-13 16:31:06 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-03-13 16:31:06 +0400 |
| commit | 23fd670c39ac6f631e6826988b65a6f1a99b536d (patch) | |
| tree | 5b56a09906600f66eb8de74587e6dbbdc4828afa /intern/cycles/CMakeLists.txt | |
| parent | 899caeae498434462d0cb4775c10944929d325c4 (diff) | |
Code cleanup: cmake
Diffstat (limited to 'intern/cycles/CMakeLists.txt')
| -rw-r--r-- | intern/cycles/CMakeLists.txt | 29 |
1 files changed, 21 insertions, 8 deletions
diff --git a/intern/cycles/CMakeLists.txt b/intern/cycles/CMakeLists.txt index 5c8d68b07ee..c2f40295421 100644 --- a/intern/cycles/CMakeLists.txt +++ b/intern/cycles/CMakeLists.txt @@ -53,7 +53,12 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ffast-math") endif() -add_definitions(-DWITH_KERNEL_SSE2 -DWITH_KERNEL_SSE3 -DWITH_KERNEL_SSE41 -DWITH_KERNEL_AVX) +add_definitions( + -DWITH_KERNEL_SSE2 + -DWITH_KERNEL_SSE3 + -DWITH_KERNEL_SSE41 + -DWITH_KERNEL_AVX +) # for OSL if(WIN32 AND MSVC) @@ -64,10 +69,15 @@ endif() # Definitions and Includes -add_definitions(${BOOST_DEFINITIONS} ${OPENIMAGEIO_DEFINITIONS}) +add_definitions( + ${BOOST_DEFINITIONS} + ${OPENIMAGEIO_DEFINITIONS} +) -add_definitions(-DCCL_NAMESPACE_BEGIN=namespace\ ccl\ {) -add_definitions(-DCCL_NAMESPACE_END=}) +add_definitions( + -DCCL_NAMESPACE_BEGIN=namespace\ ccl\ { + -DCCL_NAMESPACE_END=} +) if(WITH_CYCLES_NETWORK) add_definitions(-DWITH_NETWORK) @@ -91,9 +101,11 @@ if(WITH_CYCLES_OSL) include_directories(${OSL_INCLUDES}) endif() -add_definitions(-DWITH_OPENCL) -add_definitions(-DWITH_CUDA) -add_definitions(-DWITH_MULTI) +add_definitions( + -DWITH_OPENCL + -DWITH_CUDA + -DWITH_MULTI +) include_directories( SYSTEM @@ -101,7 +113,8 @@ include_directories( ${OPENIMAGEIO_INCLUDE_DIRS} ${OPENIMAGEIO_INCLUDE_DIRS}/OpenImageIO ${OPENEXR_INCLUDE_DIR} - ${OPENEXR_INCLUDE_DIRS}) + ${OPENEXR_INCLUDE_DIRS} +) # Subdirectories |