[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49816] trunk/blender: minor improvements to cmake's datatoc usage, now changes to datatoc. c re-make generated files.

[Campbell Barton]

Revision: 49816
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49816
Author:   campbellbarton
Date:     2012-08-11 18:39:38 +0000 (Sat, 11 Aug 2012)
Log Message:
-----------
minor improvements to cmake's datatoc usage, now changes to datatoc.c re-make generated files.

Modified Paths:
--------------
    trunk/blender/build_files/cmake/macros.cmake
    trunk/blender/source/blender/datatoc/datatoc.c

Modified: trunk/blender/build_files/cmake/macros.cmake
===================================================================
--- trunk/blender/build_files/cmake/macros.cmake	2012-08-11 18:25:45 UTC (rev 49815)
+++ trunk/blender/build_files/cmake/macros.cmake	2012-08-11 18:39:38 UTC (rev 49816)
@@ -739,10 +739,8 @@
 	add_custom_command(
 		OUTPUT ${file_to}
 		COMMAND ${CMAKE_COMMAND} -E make_directory ${_file_to_path}
-		COMMAND ${CMAKE_BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/datatoc
-		        ${file_from}
-		        ${file_to}
-		DEPENDS ${file_from})
+		COMMAND ${CMAKE_BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/datatoc ${file_from} ${file_to}
+		DEPENDS ${file_from} datatoc)
 	unset(_file_to_path)
 endmacro()
 
@@ -751,22 +749,21 @@
       file_from
       list_to_add)
 
-	# only to avoid confusion
-	set(_file_to ${file_from}.c)
+	# remove ../'s
+	get_filename_component(_file_from ${CMAKE_CURRENT_SOURCE_DIR}/${file_from}   REALPATH)
+	get_filename_component(_file_to   ${CMAKE_CURRENT_BINARY_DIR}/${file_from}.c REALPATH)
 
-	list(APPEND ${list_to_add} ${CMAKE_CURRENT_BINARY_DIR}/${_file_to})
+	list(APPEND ${list_to_add} ${_file_to})
 
 	get_filename_component(_file_to_path ${_file_to} PATH)
 
 	add_custom_command(
-		OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_file_to}
+		OUTPUT  ${_file_to}
 		COMMAND ${CMAKE_COMMAND} -E make_directory ${_file_to_path}
-		COMMAND ${CMAKE_BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/datatoc
-		        ${CMAKE_CURRENT_SOURCE_DIR}/${file_from}
-		        ${CMAKE_CURRENT_BINARY_DIR}/${_file_to}
-		DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${file_from})
+		COMMAND ${CMAKE_BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/datatoc ${_file_from} ${_file_to}
+		DEPENDS ${_file_from} datatoc)
 
-	unset(_var_name)
+	unset(_file_from)
 	unset(_file_to)
 	unset(_file_to_path)
 endmacro()

Modified: trunk/blender/source/blender/datatoc/datatoc.c
===================================================================
--- trunk/blender/source/blender/datatoc/datatoc.c	2012-08-11 18:25:45 UTC (rev 49815)
+++ trunk/blender/source/blender/datatoc/datatoc.c	2012-08-11 18:39:38 UTC (rev 49816)
@@ -104,9 +104,11 @@
 	fprintf(fpout, "int datatoc_%s_size = %s;\n", argv[1], sizest);
 	fprintf(fpout, "char datatoc_%s[] = {\n", argv[1]);
 	while (size--) {
+#ifdef VERBOSE
 		if (size % 32 == 31) {
 			fprintf(fpout, "\n");
 		}
+#endif
 
 		/* fprintf (fpout, "\\x%02x", getc(fpin)); */
 		fprintf(fpout, "%3d,", getc(fpin));