King_DuckZ/cmake-d
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Add using of CMAKE_D_FLAGS and includes for dependency tracking

Browse source
This commit is contained in:
Jens K. Mueller 2010-10-03 01:12:11 +02:00
parent 97b6c15587
commit 71fc5e54e2
2 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
cmaked/UseDDeps.cmake
View file

@ -24,21 +24,19 @@ macro(add_executable_with_dependencies _target)
#message("Checking dependencies for ${source_file}") #message("Checking dependencies for ${source_file}")
#message("Put into ${dependency_file}") #message("Put into ${dependency_file}")
# TODO
# better way to get the included directories
get_directory_property(include_dirs INCLUDE_DIRECTORIES) get_directory_property(include_dirs INCLUDE_DIRECTORIES)
set(INCLUDES )
foreach(include_dir IN LISTS include_dirs) foreach(include_dir IN LISTS include_dirs)
#message("Adding include directory ${include_dir}") list(APPEND INCLUDES "${CMAKE_INCLUDE_FLAG_D}${include_dir}")
set(include_directories "-I${include_dir} ${include_directories}")
endforeach() 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( execute_process(
COMMAND ${CMAKE_COMMAND} COMMAND ${CMAKE_COMMAND}
-D "CMAKE_D_COMPILER:STRING=${CMAKE_D_COMPILER}" -D "CMAKE_D_COMPILER:STRING=${CMAKE_D_COMPILER}"
-D "CMAKE_D_FLAGS:STRING=${CMAKE_D_FLAGS}" -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 "source_file:STRING=${source_file}"
-D "dependency_file:STRING=${dependency_file}" -D "dependency_file:STRING=${dependency_file}"
-P "${CMAKE_ROOT}/Modules/dependencies.cmake" # TODO hard coded path -P "${CMAKE_ROOT}/Modules/dependencies.cmake" # TODO hard coded path
@ -54,7 +52,7 @@ macro(add_executable_with_dependencies _target)
COMMAND ${CMAKE_COMMAND} COMMAND ${CMAKE_COMMAND}
-D "CMAKE_D_COMPILER:STRING=${CMAKE_D_COMPILER}" -D "CMAKE_D_COMPILER:STRING=${CMAKE_D_COMPILER}"
-D "CMAKE_D_FLAGS:STRING=${CMAKE_D_FLAGS}" -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 "source_file:STRING=${source_file}"
-D "dependency_file:STRING=${dependency_file}" -D "dependency_file:STRING=${dependency_file}"
-P "${CMAKE_ROOT}/Modules/dependencies.cmake" # TODO hard coded path -P "${CMAKE_ROOT}/Modules/dependencies.cmake" # TODO hard coded path

7
cmaked/dependencies.cmake
View file

@ -6,7 +6,12 @@
#message("source file ${source_file}") #message("source file ${source_file}")
#message("dependency file ${dependency_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}") #message("executing: ${CMAKE_D_COMPILER} ${CMAKE_D_FLAGS} ${include_directories} -deps=${dependency_file}.tmp -o- ${source_file}")
if(NOT EXISTS ${dependency_file}) if(NOT EXISTS ${dependency_file})