Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

CMake: cleanup, arg rename, add definitions last

Browse Source
This commit is contained in:
Campbell Barton
2019-04-16 06:11:27 +02:00
parent bb6b7dd4ad
commit 813e470eac
25 changed files with 98 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
source/creator/CMakeLists.txt
View File

@@ -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