Commit: 54994740bdfe2aa3b2e7233de9494b3b033183f1
Author: Campbell Barton
Date: Thu Feb 19 07:15:55 2015 +1100
Branches: master
https://developer.blender.org/rB54994740bdfe2aa3b2e7233de9494b3b033183f1
CMake: indent & missing header
===================================================================
M CMakeLists.txt
M source/blender/python/intern/CMakeLists.txt
===================================================================
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 561d7f1..5b85306 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1255,8 +1255,8 @@ elseif(WIN32)
find_package(png)
if(NOT PNG_FOUND)
- set(PNG_PNG_INCLUDE_DIR ${LIBDIR}/png/include)
message(WARNING "Using HARDCODED libpng locations")
+ set(PNG_PNG_INCLUDE_DIR ${LIBDIR}/png/include)
set(PNG_LIBRARIES libpng)
set(PNG "${LIBDIR}/png")
set(PNG_INCLUDE_DIRS "${PNG}/include")
@@ -1343,18 +1343,18 @@ elseif(WIN32)
set(OPENEXR_VERSION "2.1")
find_package(OPENEXR REQUIRED)
if(NOT OPENEXR_FOUND)
- message(WARNING "Using HARDCODED OpenEXR locations")
- set(OPENEXR ${LIBDIR}/openexr)
- set(OPENEXR_INCLUDE_DIR ${OPENEXR}/include)
- set(OPENEXR_INCLUDE_DIRS ${OPENEXR}/include/OpenEXR)
- set(OPENEXR_LIBPATH ${OPENEXR}/lib)
- set(OPENEXR_LIBRARIES
- ${OPENEXR_LIBPATH}/Iex-2_2.lib
- ${OPENEXR_LIBPATH}/Half.lib
- ${OPENEXR_LIBPATH}/IlmImf-2_2.lib
- ${OPENEXR_LIBPATH}/Imath-2_2.lib
- ${OPENEXR_LIBPATH}/IlmThread-2_2.lib
- )
+ message(WARNING "Using HARDCODED OpenEXR
locations")
+ set(OPENEXR ${LIBDIR}/openexr)
+ set(OPENEXR_INCLUDE_DIR ${OPENEXR}/include)
+ set(OPENEXR_INCLUDE_DIRS
${OPENEXR}/include/OpenEXR)
+ set(OPENEXR_LIBPATH ${OPENEXR}/lib)
+ set(OPENEXR_LIBRARIES
+ ${OPENEXR_LIBPATH}/Iex-2_2.lib
+ ${OPENEXR_LIBPATH}/Half.lib
+ ${OPENEXR_LIBPATH}/IlmImf-2_2.lib
+ ${OPENEXR_LIBPATH}/Imath-2_2.lib
+ ${OPENEXR_LIBPATH}/IlmThread-2_2.lib
+ )
endif(NOT OPENEXR_FOUND)
endif()
diff --git a/source/blender/python/intern/CMakeLists.txt
b/source/blender/python/intern/CMakeLists.txt
index 8f85dbe..8296027 100644
--- a/source/blender/python/intern/CMakeLists.txt
+++ b/source/blender/python/intern/CMakeLists.txt
@@ -47,8 +47,8 @@ set(SRC
gpu.c
bpy.c
bpy_app.c
- bpy_app_ffmpeg.c
bpy_app_build_options.c
+ bpy_app_ffmpeg.c
bpy_app_handlers.c
bpy_app_ocio.c
bpy_app_oiio.c
@@ -75,11 +75,12 @@ set(SRC
gpu.h
bpy.h
bpy_app.h
- bpy_app_ffmpeg.h
bpy_app_build_options.h
+ bpy_app_ffmpeg.h
bpy_app_handlers.h
bpy_app_ocio.h
bpy_app_oiio.h
+ bpy_app_sdl.h
bpy_app_translations.h
bpy_driver.h
bpy_intern_string.h
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
