CMake: indent & missing header
authorCampbell Barton <ideasman42@gmail.com>
Wed, 18 Feb 2015 20:15:55 +0000 (07:15 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 18 Feb 2015 20:15:55 +0000 (07:15 +1100)
CMakeLists.txt
source/blender/python/intern/CMakeLists.txt

index 561d7f18ff5301ed04b9b31b929deb0504b89cff..5b8530640b9adbbf8d253f6de6fae3359ebafeb2 100644 (file)
@@ -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()
 
index 8f85dbe11d7db0f4a79720253a0c79cc24331282..8296027f044ba88532733a0fb95adf1eab588ec8 100644 (file)
@@ -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