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

CMake: indent & missing header

Browse Source
This commit is contained in:
Campbell Barton
2015-02-19 07:15:55 +11:00
parent 483fa4c387
commit 54994740bd
2 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
CMakeLists.txt
View File

@@ -1255,8 +1255,8 @@ elseif(WIN32)
find_package(png) find_package(png)
if(NOT PNG_FOUND) if(NOT PNG_FOUND)
set(PNG_PNG_INCLUDE_DIR ${LIBDIR}/png/include)
message(WARNING "Using HARDCODED libpng locations") message(WARNING "Using HARDCODED libpng locations")
set(PNG_PNG_INCLUDE_DIR ${LIBDIR}/png/include)
set(PNG_LIBRARIES libpng) set(PNG_LIBRARIES libpng)
set(PNG "${LIBDIR}/png") set(PNG "${LIBDIR}/png")
set(PNG_INCLUDE_DIRS "${PNG}/include") set(PNG_INCLUDE_DIRS "${PNG}/include")
@@ -1343,18 +1343,18 @@ elseif(WIN32)
set(OPENEXR_VERSION "2.1") set(OPENEXR_VERSION "2.1")
find_package(OPENEXR REQUIRED) find_package(OPENEXR REQUIRED)
if(NOT OPENEXR_FOUND) if(NOT OPENEXR_FOUND)
message(WARNING "Using HARDCODED OpenEXR locations") message(WARNING "Using HARDCODED OpenEXR locations")
set(OPENEXR ${LIBDIR}/openexr) set(OPENEXR ${LIBDIR}/openexr)
set(OPENEXR_INCLUDE_DIR ${OPENEXR}/include) set(OPENEXR_INCLUDE_DIR ${OPENEXR}/include)
set(OPENEXR_INCLUDE_DIRS ${OPENEXR}/include/OpenEXR) set(OPENEXR_INCLUDE_DIRS ${OPENEXR}/include/OpenEXR)
set(OPENEXR_LIBPATH ${OPENEXR}/lib) set(OPENEXR_LIBPATH ${OPENEXR}/lib)
set(OPENEXR_LIBRARIES set(OPENEXR_LIBRARIES
${OPENEXR_LIBPATH}/Iex-2_2.lib ${OPENEXR_LIBPATH}/Iex-2_2.lib
${OPENEXR_LIBPATH}/Half.lib ${OPENEXR_LIBPATH}/Half.lib
${OPENEXR_LIBPATH}/IlmImf-2_2.lib ${OPENEXR_LIBPATH}/IlmImf-2_2.lib
${OPENEXR_LIBPATH}/Imath-2_2.lib ${OPENEXR_LIBPATH}/Imath-2_2.lib
${OPENEXR_LIBPATH}/IlmThread-2_2.lib ${OPENEXR_LIBPATH}/IlmThread-2_2.lib
) )
endif(NOT OPENEXR_FOUND) endif(NOT OPENEXR_FOUND)
endif() endif()

5
source/blender/python/intern/CMakeLists.txt
View File

@@ -47,8 +47,8 @@ set(SRC
gpu.c gpu.c
bpy.c bpy.c
bpy_app.c bpy_app.c
bpy_app_ffmpeg.c
bpy_app_build_options.c bpy_app_build_options.c
bpy_app_ffmpeg.c
bpy_app_handlers.c bpy_app_handlers.c
bpy_app_ocio.c bpy_app_ocio.c
bpy_app_oiio.c bpy_app_oiio.c
@@ -75,11 +75,12 @@ set(SRC
gpu.h gpu.h
bpy.h bpy.h
bpy_app.h bpy_app.h
bpy_app_ffmpeg.h
bpy_app_build_options.h bpy_app_build_options.h
bpy_app_ffmpeg.h
bpy_app_handlers.h bpy_app_handlers.h
bpy_app_ocio.h bpy_app_ocio.h
bpy_app_oiio.h bpy_app_oiio.h
bpy_app_sdl.h
bpy_app_translations.h bpy_app_translations.h
bpy_driver.h bpy_driver.h
bpy_intern_string.h bpy_intern_string.h