Revision: 36966
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36966
Author: campbellbarton
Date: 2011-05-28 04:53:17 +0000 (Sat, 28 May 2011)
Log Message:
-----------
include ffmpeg_compat header in cmake source list.
Modified Paths:
--------------
trunk/blender/build_files/cmake/macros.cmake
trunk/blender/source/blender/editors/gpencil/gpencil_edit.c
trunk/blender/source/blender/imbuf/CMakeLists.txt
Modified: trunk/blender/build_files/cmake/macros.cmake
===================================================================
--- trunk/blender/build_files/cmake/macros.cmake 2011-05-28 03:18:40 UTC
(rev 36965)
+++ trunk/blender/build_files/cmake/macros.cmake 2011-05-28 04:53:17 UTC
(rev 36966)
@@ -13,19 +13,13 @@
include_directories(${all_incs})
endmacro()
-# only MSVC uses SOURCE_GROUP
-macro(blender_add_lib_nolist
- name
- sources
- includes)
- # message(STATUS "Configuring library ${name}")
+macro(blender_source_group
+ sources)
- blender_include_dirs("${includes}")
- add_library(${name} ${sources})
-
# Group by location on disk
source_group("Source Files" FILES CMakeLists.txt)
+
foreach(SRC ${sources})
get_filename_component(SRC_EXT ${SRC} EXT)
if(${SRC_EXT} MATCHES ".h" OR ${SRC_EXT} MATCHES ".hpp")
@@ -36,17 +30,27 @@
endforeach()
endmacro()
-# # works fine but having the includes listed is helpful for IDE's
(QtCreator/MSVC)
-# macro(blender_add_lib_nolist
-# name
-# sources
-# includes)
-#
-# message(STATUS "Configuring library ${name}")
-# include_directories(${includes})
-# add_library(${name} ${sources})
-# endmacro()
+# only MSVC uses SOURCE_GROUP
+macro(blender_add_lib_nolist
+ name
+ sources
+ includes)
+
+ # message(STATUS "Configuring library ${name}")
+
+ # include_directories(${includes})
+ blender_include_dirs("${includes}")
+
+ add_library(${name} ${sources})
+
+ # works fine without having the includes
+ # listed is helpful for IDE's (QtCreator/MSVC)
+ blender_source_group("${sources}")
+
+endmacro()
+
+
macro(blender_add_lib
name
sources
@@ -55,9 +59,9 @@
blender_add_lib_nolist(${name} "${sources}" "${includes}")
set_property(GLOBAL APPEND PROPERTY BLENDER_LINK_LIBS ${name})
-
endmacro()
+
macro(SETUP_LIBDIRS)
# see "cmake --help-policy CMP0003"
if(COMMAND cmake_policy)
Modified: trunk/blender/source/blender/editors/gpencil/gpencil_edit.c
===================================================================
--- trunk/blender/source/blender/editors/gpencil/gpencil_edit.c 2011-05-28
03:18:40 UTC (rev 36965)
+++ trunk/blender/source/blender/editors/gpencil/gpencil_edit.c 2011-05-28
04:53:17 UTC (rev 36966)
@@ -444,7 +444,6 @@
static int gp_camera_view_subrect(bContext *C, rctf *subrect)
{
- Scene *scene= CTX_data_scene(C);
View3D *v3d= CTX_wm_view3d(C);
ARegion *ar= CTX_wm_region(C);
@@ -453,6 +452,7 @@
/* for camera view set the subrect */
if (rv3d->persp == RV3D_CAMOB) {
+ Scene *scene= CTX_data_scene(C);
ED_view3d_calc_camera_border(scene, ar, v3d, rv3d,
subrect, -1); /* negative shift */
return 1;
}
Modified: trunk/blender/source/blender/imbuf/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/imbuf/CMakeLists.txt 2011-05-28 03:18:40 UTC
(rev 36965)
+++ trunk/blender/source/blender/imbuf/CMakeLists.txt 2011-05-28 04:53:17 UTC
(rev 36966)
@@ -101,6 +101,9 @@
intern/md5.h
intern/openexr/openexr_api.h
intern/openexr/openexr_multi.h
+
+ # orphan include
+ ../../../intern/ffmpeg/ffmpeg_compat.h
)
if(WITH_IMAGE_OPENEXR)
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
