kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Eliminate ExternalProject's use of CMAKE_CFG_INTDIR subdir for Makefile generators. It was causing problems with parallel make -j invocations. Keep it for multi-configuration build systems so that Debug and Release stamp files remain separate.

This commit is contained in:
David Cole 2009-09-30 16:22:36 -04:00
parent 51ba120844
commit f95bc6b5ad
1 changed files with 42 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
Modules/ExternalProject.cmake
View File

@ -485,13 +485,32 @@ function(_ep_get_build_command name step cmd_var)
endfunction(_ep_get_build_command) endfunction(_ep_get_build_command)
# This module used to use "/${CMAKE_CFG_INTDIR}" directly and produced
# makefiles with "/./" in paths for custom command dependencies. Which
# resulted in problems with parallel make -j invocations.
#
# This function was added so that the suffix (search below for ${cfgdir}) is
# only set to "/${CMAKE_CFG_INTDIR}" when ${CMAKE_CFG_INTDIR} is not going to
# be "." (multi-configuration build systems like Visual Studio and Xcode...)
#
function(_ep_get_configuration_subdir_suffix suffix_var)
set(suffix "")
if(CMAKE_CONFIGURATION_TYPES)
set(suffix "/${CMAKE_CFG_INTDIR}")
endif()
set(${suffix_var} "${suffix}" PARENT_SCOPE)
endfunction(_ep_get_configuration_subdir_suffix)
function(ExternalProject_Add_Step name step) function(ExternalProject_Add_Step name step)
set(cmf_dir ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles) set(cmf_dir ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles)
ExternalProject_Get_Property(${name} stamp_dir) ExternalProject_Get_Property(${name} stamp_dir)
_ep_get_configuration_subdir_suffix(cfgdir)
add_custom_command(APPEND add_custom_command(APPEND
OUTPUT ${cmf_dir}/${CMAKE_CFG_INTDIR}/${name}-complete OUTPUT ${cmf_dir}${cfgdir}/${name}-complete
DEPENDS ${stamp_dir}/${CMAKE_CFG_INTDIR}/${name}-${step} DEPENDS ${stamp_dir}${cfgdir}/${name}-${step}
) )
_ep_parse_arguments(ExternalProject_Add_Step _ep_parse_arguments(ExternalProject_Add_Step
${name} _EP_${step}_ "${ARGN}") ${name} _EP_${step}_ "${ARGN}")
@ -500,8 +519,8 @@ function(ExternalProject_Add_Step name step)
get_property(dependers TARGET ${name} PROPERTY _EP_${step}_DEPENDERS) get_property(dependers TARGET ${name} PROPERTY _EP_${step}_DEPENDERS)
foreach(depender IN LISTS dependers) foreach(depender IN LISTS dependers)
add_custom_command(APPEND add_custom_command(APPEND
OUTPUT ${stamp_dir}/${CMAKE_CFG_INTDIR}/${name}-${depender} OUTPUT ${stamp_dir}${cfgdir}/${name}-${depender}
DEPENDS ${stamp_dir}/${CMAKE_CFG_INTDIR}/${name}-${step} DEPENDS ${stamp_dir}${cfgdir}/${name}-${step}
) )
endforeach() endforeach()
@ -511,7 +530,7 @@ function(ExternalProject_Add_Step name step)
# Dependencies on steps. # Dependencies on steps.
get_property(dependees TARGET ${name} PROPERTY _EP_${step}_DEPENDEES) get_property(dependees TARGET ${name} PROPERTY _EP_${step}_DEPENDEES)
foreach(dependee IN LISTS dependees) foreach(dependee IN LISTS dependees)
list(APPEND depends ${stamp_dir}/${CMAKE_CFG_INTDIR}/${name}-${dependee}) list(APPEND depends ${stamp_dir}${cfgdir}/${name}-${dependee})
endforeach() endforeach()
# The command to run. # The command to run.
@ -548,14 +567,14 @@ function(ExternalProject_Add_Step name step)
# Run every time? # Run every time?
get_property(always TARGET ${name} PROPERTY _EP_${step}_ALWAYS) get_property(always TARGET ${name} PROPERTY _EP_${step}_ALWAYS)
if(always) if(always)
set_property(SOURCE ${stamp_dir}/${CMAKE_CFG_INTDIR}/${name}-${step} PROPERTY SYMBOLIC 1) set_property(SOURCE ${stamp_dir}${cfgdir}/${name}-${step} PROPERTY SYMBOLIC 1)
set(touch) set(touch)
else() else()
set(touch ${CMAKE_COMMAND} -E touch ${stamp_dir}/${CMAKE_CFG_INTDIR}/${name}-${step}) set(touch ${CMAKE_COMMAND} -E touch ${stamp_dir}${cfgdir}/${name}-${step})
endif() endif()
add_custom_command( add_custom_command(
OUTPUT ${stamp_dir}/${CMAKE_CFG_INTDIR}/${name}-${step} OUTPUT ${stamp_dir}${cfgdir}/${name}-${step}
COMMENT ${comment} COMMENT ${comment}
COMMAND ${command} COMMAND ${command}
COMMAND ${touch} COMMAND ${touch}
@ -569,13 +588,16 @@ endfunction(ExternalProject_Add_Step)
function(_ep_add_mkdir_command name) function(_ep_add_mkdir_command name)
ExternalProject_Get_Property(${name} ExternalProject_Get_Property(${name}
source_dir binary_dir install_dir stamp_dir download_dir tmp_dir) source_dir binary_dir install_dir stamp_dir download_dir tmp_dir)
_ep_get_configuration_subdir_suffix(cfgdir)
ExternalProject_Add_Step(${name} mkdir ExternalProject_Add_Step(${name} mkdir
COMMENT "Creating directories for '${name}'" COMMENT "Creating directories for '${name}'"
COMMAND ${CMAKE_COMMAND} -E make_directory ${source_dir} COMMAND ${CMAKE_COMMAND} -E make_directory ${source_dir}
COMMAND ${CMAKE_COMMAND} -E make_directory ${binary_dir} COMMAND ${CMAKE_COMMAND} -E make_directory ${binary_dir}
COMMAND ${CMAKE_COMMAND} -E make_directory ${install_dir} COMMAND ${CMAKE_COMMAND} -E make_directory ${install_dir}
COMMAND ${CMAKE_COMMAND} -E make_directory ${tmp_dir} COMMAND ${CMAKE_COMMAND} -E make_directory ${tmp_dir}
COMMAND ${CMAKE_COMMAND} -E make_directory ${stamp_dir}/${CMAKE_CFG_INTDIR} COMMAND ${CMAKE_COMMAND} -E make_directory ${stamp_dir}${cfgdir}
COMMAND ${CMAKE_COMMAND} -E make_directory ${download_dir} COMMAND ${CMAKE_COMMAND} -E make_directory ${download_dir}
) )
endfunction(_ep_add_mkdir_command) endfunction(_ep_add_mkdir_command)
@ -766,12 +788,14 @@ endfunction(_ep_add_patch_command)
function(_ep_add_configure_command name) function(_ep_add_configure_command name)
ExternalProject_Get_Property(${name} source_dir binary_dir) ExternalProject_Get_Property(${name} source_dir binary_dir)
_ep_get_configuration_subdir_suffix(cfgdir)
# Depend on other external projects (file-level). # Depend on other external projects (file-level).
set(file_deps) set(file_deps)
get_property(deps TARGET ${name} PROPERTY _EP_DEPENDS) get_property(deps TARGET ${name} PROPERTY _EP_DEPENDS)
foreach(dep IN LISTS deps) foreach(dep IN LISTS deps)
get_property(dep_stamp_dir TARGET ${dep} PROPERTY _EP_STAMP_DIR) get_property(dep_stamp_dir TARGET ${dep} PROPERTY _EP_STAMP_DIR)
list(APPEND file_deps ${dep_stamp_dir}/${CMAKE_CFG_INTDIR}/${dep}-done) list(APPEND file_deps ${dep_stamp_dir}${cfgdir}/${dep}-done)
endforeach() endforeach()
get_property(cmd_set TARGET ${name} PROPERTY _EP_CONFIGURE_COMMAND SET) get_property(cmd_set TARGET ${name} PROPERTY _EP_CONFIGURE_COMMAND SET)
@ -874,9 +898,11 @@ endfunction(_ep_add_test_command)
function(ExternalProject_Add name) function(ExternalProject_Add name)
_ep_get_configuration_subdir_suffix(cfgdir)
# Add a custom target for the external project. # Add a custom target for the external project.
set(cmf_dir ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles) set(cmf_dir ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles)
add_custom_target(${name} ALL DEPENDS ${cmf_dir}/${CMAKE_CFG_INTDIR}/${name}-complete) add_custom_target(${name} ALL DEPENDS ${cmf_dir}${cfgdir}/${name}-complete)
set_property(TARGET ${name} PROPERTY _EP_IS_EXTERNAL_PROJECT 1) set_property(TARGET ${name} PROPERTY _EP_IS_EXTERNAL_PROJECT 1)
_ep_parse_arguments(ExternalProject_Add ${name} _EP_ "${ARGN}") _ep_parse_arguments(ExternalProject_Add ${name} _EP_ "${ARGN}")
_ep_set_directories(${name}) _ep_set_directories(${name})
@ -889,12 +915,12 @@ function(ExternalProject_Add name)
# custom command so that CMake does not propagate build rules to # custom command so that CMake does not propagate build rules to
# other external project targets. # other external project targets.
add_custom_command( add_custom_command(
OUTPUT ${cmf_dir}/${CMAKE_CFG_INTDIR}/${name}-complete OUTPUT ${cmf_dir}${cfgdir}/${name}-complete
COMMENT "Completed '${name}'" COMMENT "Completed '${name}'"
COMMAND ${CMAKE_COMMAND} -E make_directory ${cmf_dir}/${CMAKE_CFG_INTDIR} COMMAND ${CMAKE_COMMAND} -E make_directory ${cmf_dir}${cfgdir}
COMMAND ${CMAKE_COMMAND} -E touch ${cmf_dir}/${CMAKE_CFG_INTDIR}/${name}-complete COMMAND ${CMAKE_COMMAND} -E touch ${cmf_dir}${cfgdir}/${name}-complete
COMMAND ${CMAKE_COMMAND} -E touch ${stamp_dir}/${CMAKE_CFG_INTDIR}/${name}-done COMMAND ${CMAKE_COMMAND} -E touch ${stamp_dir}${cfgdir}/${name}-done
DEPENDS ${stamp_dir}/${CMAKE_CFG_INTDIR}/${name}-install DEPENDS ${stamp_dir}${cfgdir}/${name}-install
VERBATIM VERBATIM
) )