[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32662] trunk/blender: - CMake now only uses SOURCE_GROUP with MSVC lib configuration, saves recursive header search when not using msvc.

Campbell Barton ideasman42 at gmail.com
Sat Oct 23 06:18:53 CEST 2010


Revision: 32662
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32662
Author:   campbellbarton
Date:     2010-10-23 06:18:53 +0200 (Sat, 23 Oct 2010)

Log Message:
-----------
- CMake now only uses SOURCE_GROUP with MSVC lib configuration, saves recursive header search when not using msvc.
- uv layout export wasn't setting the default filename.

Modified Paths:
--------------
    trunk/blender/build_files/cmake/macros.cmake
    trunk/blender/release/scripts/op/uv.py
    trunk/blender/source/blenderplayer/bad_level_call_stubs/stubs.c

Modified: trunk/blender/build_files/cmake/macros.cmake
===================================================================
--- trunk/blender/build_files/cmake/macros.cmake	2010-10-23 04:05:55 UTC (rev 32661)
+++ trunk/blender/build_files/cmake/macros.cmake	2010-10-23 04:18:53 UTC (rev 32662)
@@ -1,31 +1,46 @@
-MACRO(BLENDERLIB_NOLIST
-	name
-	sources
-	includes)
 
-	# Gather all headers
-	FILE(GLOB_RECURSE INC_ALL *.h)
-		 
-	INCLUDE_DIRECTORIES(${includes})
-	ADD_LIBRARY(${name} ${INC_ALL} ${sources})
+IF(MSVC)
+	# only MSVC uses SOURCE_GROUP
+	MACRO(BLENDERLIB_NOLIST
+		name
+		sources
+		includes)
 
-	# Group by location on disk
-	SOURCE_GROUP(Files FILES CMakeLists.txt)
-	SET(ALL_FILES ${sources} ${INC_ALL})
-	FOREACH(SRC ${ALL_FILES})
-		STRING(REGEX REPLACE ${CMAKE_CURRENT_SOURCE_DIR} "Files" REL_DIR "${SRC}")
-		STRING(REGEX REPLACE "[\\\\/][^\\\\/]*$" "" REL_DIR "${REL_DIR}")
-		STRING(REGEX REPLACE "^[\\\\/]" "" REL_DIR "${REL_DIR}")
-		IF(REL_DIR)
-			SOURCE_GROUP(${REL_DIR} FILES ${SRC})
-		ELSE(REL_DIR)
-			SOURCE_GROUP(Files FILES ${SRC})
-		ENDIF(REL_DIR)
-	ENDFOREACH(SRC)
+		MESSAGE(STATUS "Configuring library ${name}")
 
-	MESSAGE(STATUS "Configuring library ${name}")
-ENDMACRO(BLENDERLIB_NOLIST)
+		# Gather all headers
+		FILE(GLOB_RECURSE INC_ALL *.h)
+			 
+		INCLUDE_DIRECTORIES(${includes})
+		ADD_LIBRARY(${name} ${INC_ALL} ${sources})
 
+		# Group by location on disk
+		SOURCE_GROUP(Files FILES CMakeLists.txt)
+		SET(ALL_FILES ${sources} ${INC_ALL})
+		FOREACH(SRC ${ALL_FILES})
+			STRING(REGEX REPLACE ${CMAKE_CURRENT_SOURCE_DIR} "Files" REL_DIR "${SRC}")
+			STRING(REGEX REPLACE "[\\\\/][^\\\\/]*$" "" REL_DIR "${REL_DIR}")
+			STRING(REGEX REPLACE "^[\\\\/]" "" REL_DIR "${REL_DIR}")
+			IF(REL_DIR)
+				SOURCE_GROUP(${REL_DIR} FILES ${SRC})
+			ELSE(REL_DIR)
+				SOURCE_GROUP(Files FILES ${SRC})
+			ENDIF(REL_DIR)
+		ENDFOREACH(SRC)
+	ENDMACRO(BLENDERLIB_NOLIST)
+ELSE(MSVC)
+
+	MACRO(BLENDERLIB_NOLIST
+		name
+		sources
+		includes)
+
+		MESSAGE(STATUS "Configuring library ${name}")
+		INCLUDE_DIRECTORIES(${includes})
+		ADD_LIBRARY(${name} ${sources})
+	ENDMACRO(BLENDERLIB_NOLIST)
+ENDIF(MSVC)
+
 MACRO(BLENDERLIB
 	name
 	sources

Modified: trunk/blender/release/scripts/op/uv.py
===================================================================
--- trunk/blender/release/scripts/op/uv.py	2010-10-23 04:05:55 UTC (rev 32661)
+++ trunk/blender/release/scripts/op/uv.py	2010-10-23 04:18:53 UTC (rev 32662)
@@ -355,7 +355,9 @@
 
 
     def invoke(self, context, event):
+        import os
         self.size = self._image_size(context)
+        self.filepath = os.path.splitext(bpy.data.filepath)[0]
         wm = context.window_manager
         wm.add_fileselect(self)
         return {'RUNNING_MODAL'}

Modified: trunk/blender/source/blenderplayer/bad_level_call_stubs/stubs.c
===================================================================
--- trunk/blender/source/blenderplayer/bad_level_call_stubs/stubs.c	2010-10-23 04:05:55 UTC (rev 32661)
+++ trunk/blender/source/blenderplayer/bad_level_call_stubs/stubs.c	2010-10-23 04:18:53 UTC (rev 32662)
@@ -89,6 +89,7 @@
 struct wmOperator;
 struct wmWindowManager;
 struct View3D;
+struct ToolSettings;
 
 
 /*new render funcs */





More information about the Bf-blender-cvs mailing list