Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-03 13:56:05 +00:00
Code Issues Projects Releases Packages Wiki Activity

[CMAKE]: Fix the dependencies for the hybridcd.

Browse source 
svn path=/trunk/; revision=73654
This commit is contained in:
Hermès Bélusca-Maïto 2017-02-01 02:18:30 +00:00
parent 103ff5a0b0
commit 229958ea1d
1 changed files with 25 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

10
reactos/sdk/cmake/CMakeMacros.cmake
View file

@ -321,8 +321,8 @@ function(add_cd_file)
set_property(GLOBAL APPEND PROPERTY HYBRIDCD_FILE_LIST "bootcd/${_CD_DESTINATION}/${__file}=${item}") set_property(GLOBAL APPEND PROPERTY HYBRIDCD_FILE_LIST "bootcd/${_CD_DESTINATION}/${__file}=${item}")
endif() endif()
endforeach() endforeach()
if(_CD_TARGET)
# manage dependency # manage dependency
if(_CD_TARGET)
add_dependencies(bootcd ${_CD_TARGET} registry_inf) add_dependencies(bootcd ${_CD_TARGET} registry_inf)
endif() endif()
else() else()
@ -331,8 +331,8 @@ function(add_cd_file)
file(RELATIVE_PATH __relative_file ${REACTOS_SOURCE_DIR} ${_CD_FILE}) file(RELATIVE_PATH __relative_file ${REACTOS_SOURCE_DIR} ${_CD_FILE})
file(APPEND ${REACTOS_BINARY_DIR}/boot/bootdata/packages/reactos.dff.dyn "\"${__relative_file}\" ${_num}\n") file(APPEND ${REACTOS_BINARY_DIR}/boot/bootdata/packages/reactos.dff.dyn "\"${__relative_file}\" ${_num}\n")
unset(__relative_file) unset(__relative_file)
if(_CD_TARGET)
# manage dependency - target level # manage dependency - target level
if(_CD_TARGET)
add_dependencies(reactos_cab_inf ${_CD_TARGET}) add_dependencies(reactos_cab_inf ${_CD_TARGET})
endif() endif()
# manage dependency - file level # manage dependency - file level
@ -365,6 +365,10 @@ function(add_cd_file)
# do we need also to add it to hybridcd? # do we need also to add it to hybridcd?
list(FIND _CD_FOR hybridcd __cd) list(FIND _CD_FOR hybridcd __cd)
if(NOT __cd EQUAL -1) if(NOT __cd EQUAL -1)
# manage dependency
if(_CD_TARGET)
add_dependencies(hybridcd ${_CD_TARGET})
endif()
foreach(item ${_CD_FILE}) foreach(item ${_CD_FILE})
if(_CD_NAME_ON_CD) if(_CD_NAME_ON_CD)
# rename it in the cd tree # rename it in the cd tree
@ -391,8 +395,8 @@ function(add_cd_file)
endif() endif()
set_property(GLOBAL APPEND PROPERTY BOOTCDREGTEST_FILE_LIST "${_CD_DESTINATION}/${__file}=${item}") set_property(GLOBAL APPEND PROPERTY BOOTCDREGTEST_FILE_LIST "${_CD_DESTINATION}/${__file}=${item}")
endforeach() endforeach()
if(_CD_TARGET)
# manage dependency # manage dependency
if(_CD_TARGET)
add_dependencies(bootcdregtest ${_CD_TARGET} registry_inf) add_dependencies(bootcdregtest ${_CD_TARGET} registry_inf)
endif() endif()
else() else()