diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2019-04-16 07:11:27 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2019-04-16 07:15:18 +0300 |
| commit | 813e470eac309a78d1f8cdc4a3abb0314b0ee5f3 (patch) | |
| tree | 65bfb0ea60eb6f595b38fedcf33eb0a59f072cb0 /source/creator | |
| parent | bb6b7dd4adebcdacfeabdaf26daa5e0d49079f67 (diff) | |
CMake: cleanup, arg rename, add definitions last
Diffstat (limited to 'source/creator')
| -rw-r--r-- | source/creator/CMakeLists.txt | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index 1455560d138..5111e2b5491 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -52,9 +52,11 @@ if(WITH_LIBMV) add_definitions(-DWITH_LIBMV) endif() -if(WITH_CYCLES AND WITH_CYCLES_LOGGING) - blender_include_dirs(../../intern/cycles/blender) - add_definitions(-DWITH_CYCLES_LOGGING) +if(WITH_CYCLES) + if(WITH_CYCLES_LOGGING) + blender_include_dirs(../../intern/cycles/blender) + add_definitions(-DWITH_CYCLES_LOGGING) + endif() endif() if(WITH_CODEC_FFMPEG) @@ -76,20 +78,20 @@ endif() if(WITH_SDL) if(WITH_SDL_DYNLOAD) - add_definitions(-DWITH_SDL_DYNLOAD) blender_include_dirs(../../extern/sdlew/include) + add_definitions(-DWITH_SDL_DYNLOAD) endif() add_definitions(-DWITH_SDL) endif() if(WITH_BINRELOC) - add_definitions(-DWITH_BINRELOC) blender_include_dirs(${BINRELOC_INCLUDE_DIRS}) + add_definitions(-DWITH_BINRELOC) endif() if(WITH_FREESTYLE) - add_definitions(-DWITH_FREESTYLE) blender_include_dirs(../blender/freestyle) + add_definitions(-DWITH_FREESTYLE) endif() # Setup the exe sources and buildinfo |