From 71fc5e54e2c06b52168a9ace97ae3453c8da7791 Mon Sep 17 00:00:00 2001
From: "Jens K. Mueller" <unknown>
Date: Sun, 3 Oct 2010 01:12:11 +0200
Subject: [PATCH] Add using of CMAKE_D_FLAGS and includes for dependency
 tracking

---
 cmaked/UseDDeps.cmake     | 14 ++++++--------
 cmaked/dependencies.cmake |  7 ++++++-
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/cmaked/UseDDeps.cmake b/cmaked/UseDDeps.cmake
index eee84b1..85d8759 100644
--- a/cmaked/UseDDeps.cmake
+++ b/cmaked/UseDDeps.cmake
@@ -24,21 +24,19 @@ macro(add_executable_with_dependencies _target)
 
 		#message("Checking dependencies for ${source_file}")
 		#message("Put into ${dependency_file}")
+		# TODO
+		# better way to get the included directories
 		get_directory_property(include_dirs INCLUDE_DIRECTORIES)
+		set(INCLUDES )
 		foreach(include_dir IN LISTS include_dirs)
-			#message("Adding include directory ${include_dir}")
-			set(include_directories "-I${include_dir} ${include_directories}")
+			list(APPEND INCLUDES "${CMAKE_INCLUDE_FLAG_D}${include_dir}")
 		endforeach()
 
-		# TODO
-		# somehow I have to pass each argument on its own
-		# this fails e.g. if using ${CMAKE_D_FLAGS} in dependencies.cmake
-		# or if there is more than one include dir
 		execute_process(
 			COMMAND ${CMAKE_COMMAND}
 			-D "CMAKE_D_COMPILER:STRING=${CMAKE_D_COMPILER}"
 			-D "CMAKE_D_FLAGS:STRING=${CMAKE_D_FLAGS}"
-			-D "include_directories:STRING=${include_directories}"
+			-D "include_directories:STRING=${INCLUDES}"
 			-D "source_file:STRING=${source_file}"
 			-D "dependency_file:STRING=${dependency_file}"
 			-P "${CMAKE_ROOT}/Modules/dependencies.cmake" # TODO hard coded path
@@ -54,7 +52,7 @@ macro(add_executable_with_dependencies _target)
 			COMMAND ${CMAKE_COMMAND}
 			-D "CMAKE_D_COMPILER:STRING=${CMAKE_D_COMPILER}"
 			-D "CMAKE_D_FLAGS:STRING=${CMAKE_D_FLAGS}"
-			-D "include_directories:STRING=${include_directories}"
+			-D "include_directories:STRING=${INCLUDES}"
 			-D "source_file:STRING=${source_file}"
 			-D "dependency_file:STRING=${dependency_file}"
 			-P "${CMAKE_ROOT}/Modules/dependencies.cmake" # TODO hard coded path
diff --git a/cmaked/dependencies.cmake b/cmaked/dependencies.cmake
index e6ea20e..66723ac 100644
--- a/cmaked/dependencies.cmake
+++ b/cmaked/dependencies.cmake
@@ -6,7 +6,12 @@
 #message("source file ${source_file}")
 #message("dependency file ${dependency_file}")
 
-execute_process(COMMAND ${CMAKE_D_COMPILER} ${include_directories} -deps=${dependency_file}.tmp -o- ${source_file})
+separate_arguments(CMAKE_D_FLAGS)
+
+# TODO
+# need to pass all arguments that are used for building
+# can't I use the build rule somehow
+execute_process(COMMAND ${CMAKE_D_COMPILER} ${CMAKE_D_FLAGS} ${include_directories} -deps=${dependency_file}.tmp -o- ${source_file})
 #message("executing:  ${CMAKE_D_COMPILER} ${CMAKE_D_FLAGS} ${include_directories} -deps=${dependency_file}.tmp -o- ${source_file}")
 
 if(NOT EXISTS ${dependency_file})