Cleaned up spaces/tabs and reformatted some calls

jakobwesthoff · Dec 15, 2009 · 3ac1450 · 3ac1450
1 parent 4771b59
commit 3ac1450
Showing 1 changed file with 68 additions and 53 deletions.
diff --git a/vala/ValaPrecompile.cmake b/vala/ValaPrecompile.cmake
@@ -78,64 +78,79 @@ find_package(Vala)
 # an example to every of the optional sections:
 #
 #   vala_precompile(VALA_C
-#		source1.vala
+#       source1.vala
-#		source2.vala
+#       source2.vala
-#		source3.vala
+#       source3.vala
-#	PACKAGES
+#   PACKAGES
-#		gtk+-2.0
+#       gtk+-2.0
-#		gio-1.0
+#       gio-1.0
-#		posix
+#       posix
-#	OPTIONS
+#   OPTIONS
-#		--thread
+#       --thread
-#	CUSTOM_VAPIS
+#   CUSTOM_VAPIS
-#		some_vapi.vapi
+#       some_vapi.vapi
-#	GENERATE_VAPI
+#   GENERATE_VAPI
-#		myvapi
+#       myvapi
-#	GENERATE_HEADER
+#   GENERATE_HEADER
-#		myheader
+#       myheader
+#   )
+#
+# Most important is the variable VALA_C which will contain all the generated c
+# file names after the call.
 ##
 
 macro(vala_precompile output)
-	include_directories(${CMAKE_CURRENT_BINARY_DIR})
+    include_directories(${CMAKE_CURRENT_BINARY_DIR})
-	parse_arguments(ARGS "PACKAGES;OPTIONS;GENERATE_HEADER;GENERATE_VAPI;CUSTOM_VAPIS" "" ${ARGN})
+    parse_arguments(ARGS "PACKAGES;OPTIONS;GENERATE_HEADER;GENERATE_VAPI;CUSTOM_VAPIS" "" ${ARGN})
-	set(vala_pkg_opts "")
+    set(vala_pkg_opts "")
-	foreach(pkg ${ARGS_PACKAGES})
+    foreach(pkg ${ARGS_PACKAGES})
-		list(APPEND vala_pkg_opts "--pkg=${pkg}")
+        list(APPEND vala_pkg_opts "--pkg=${pkg}")
-	endforeach(pkg ${ARGS_PACKAGES})
+    endforeach(pkg ${ARGS_PACKAGES})
-	set(in_files "")
+    set(in_files "")
-	set(out_files "")
+    set(out_files "")
-	set(${output} "")
+    set(${output} "")
-	foreach(src ${ARGS_DEFAULT_ARGS})
+    foreach(src ${ARGS_DEFAULT_ARGS})
-		list(APPEND in_files "${CMAKE_CURRENT_SOURCE_DIR}/${src}")
+        list(APPEND in_files "${CMAKE_CURRENT_SOURCE_DIR}/${src}")
-		string(REPLACE ".vala" ".c" src ${src})
+        string(REPLACE ".vala" ".c" src ${src})
-		set(out_file "${CMAKE_CURRENT_BINARY_DIR}/${src}")
+        set(out_file "${CMAKE_CURRENT_BINARY_DIR}/${src}")
-		list(APPEND out_files "${CMAKE_CURRENT_BINARY_DIR}/${src}")
+        list(APPEND out_files "${CMAKE_CURRENT_BINARY_DIR}/${src}")
-		list(APPEND ${output} ${out_file})
+        list(APPEND ${output} ${out_file})
-	endforeach(src ${ARGS_DEFAULT_ARGS})
+    endforeach(src ${ARGS_DEFAULT_ARGS})
-
-	set(vapi_arguments "")
-	if(ARGS_GENERATE_VAPI)
-		list(APPEND out_files "${CMAKE_CURRENT_BINARY_DIR}/${ARGS_GENERATE_VAPI}.vapi")
-		set(vapi_arguments "--internal-vapi=${ARGS_GENERATE_VAPI}.vapi")
 
-		# Header and internal header is needed to generate internal vapi
+    set(vapi_arguments "")
-		if (NOT ARGS_GENERATE_HEADER)
+    if(ARGS_GENERATE_VAPI)
-			set(ARGS_GENERATE_HEADER ${ARGS_GENERATE_VAPI})
+        list(APPEND out_files "${CMAKE_CURRENT_BINARY_DIR}/${ARGS_GENERATE_VAPI}.vapi")
-		endif(NOT ARGS_GENERATE_HEADER)
+        set(vapi_arguments "--internal-vapi=${ARGS_GENERATE_VAPI}.vapi")
-	endif(ARGS_GENERATE_VAPI)
 
-	set(header_arguments "")
+        # Header and internal header is needed to generate internal vapi
-	if(ARGS_GENERATE_HEADER)
+        if (NOT ARGS_GENERATE_HEADER)
-		list(APPEND out_files "${CMAKE_CURRENT_BINARY_DIR}/${ARGS_GENERATE_HEADER}.h")
+            set(ARGS_GENERATE_HEADER ${ARGS_GENERATE_VAPI})
-		list(APPEND out_files "${CMAKE_CURRENT_BINARY_DIR}/${ARGS_GENERATE_HEADER}_internal.h")
+        endif(NOT ARGS_GENERATE_HEADER)
-		list(APPEND header_arguments "--header=${ARGS_GENERATE_HEADER}.h")
+    endif(ARGS_GENERATE_VAPI)
-		list(APPEND header_arguments "--internal-header=${ARGS_GENERATE_HEADER}_internal.h")
-	endif(ARGS_GENERATE_HEADER)
 
+    set(header_arguments "")
+    if(ARGS_GENERATE_HEADER)
+        list(APPEND out_files "${CMAKE_CURRENT_BINARY_DIR}/${ARGS_GENERATE_HEADER}.h")
+        list(APPEND out_files "${CMAKE_CURRENT_BINARY_DIR}/${ARGS_GENERATE_HEADER}_internal.h")
+        list(APPEND header_arguments "--header=${ARGS_GENERATE_HEADER}.h")
+        list(APPEND header_arguments "--internal-header=${ARGS_GENERATE_HEADER}_internal.h")
+    endif(ARGS_GENERATE_HEADER)
 
-	add_custom_command(OUTPUT ${out_files} 
+    add_custom_command(OUTPUT ${out_files} 
-					   COMMAND ${VALA_EXECUTABLE} ARGS "-C" ${header_arguments} ${vapi_arguments}
+    COMMAND 
-					   "-b" ${CMAKE_CURRENT_SOURCE_DIR} "-d" ${CMAKE_CURRENT_BINARY_DIR} 
+        ${VALA_EXECUTABLE} 
-					   ${vala_pkg_opts} ${ARGS_OPTIONS} ${in_files} ${ARGS_CUSTOM_VAPIS}
+    ARGS 
-					   DEPENDS ${in_files} ${ARGS_CUSTOM_VAPIS})
+        "-C" 
+        ${header_arguments} 
+        ${vapi_arguments}
+        "-b" ${CMAKE_CURRENT_SOURCE_DIR} 
+        "-d" ${CMAKE_CURRENT_BINARY_DIR} 
+        ${vala_pkg_opts} 
+        ${ARGS_OPTIONS} 
+        ${in_files} 
+        ${ARGS_CUSTOM_VAPIS}
+    DEPENDS 
+        ${in_files} 
+        ${ARGS_CUSTOM_VAPIS}
+    )
 endmacro(vala_precompile)