Author: jgardou Date: Thu Feb 16 13:03:29 2012 New Revision: 55632
URL: http://svn.reactos.org/svn/reactos?rev=55632&view=rev Log: [CMAKE] - use relative paths for reactos.dff generation. May fix Pierre's issue, but a deeper fix is needed.
Modified: trunk/reactos/cmake/CMakeMacros.cmake
Modified: trunk/reactos/cmake/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/CMakeMacros.cmake?rev... ============================================================================== --- trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] Thu Feb 16 13:03:29 2012 @@ -154,11 +154,13 @@ else() #add it in reactos.cab dir_to_num(${_CD_DESTINATION} _num) + file(RELATIVE_PATH __relative_file ${REACTOS_SOURCE_DIR} ${_CD_FILE}) if(CMAKE_HOST_SYSTEM_NAME MATCHES Windows) - file(APPEND ${REACTOS_BINARY_DIR}/boot/bootdata/packages/reactos.dff.dyn "${_CD_FILE} ${_num}\n") + file(APPEND ${REACTOS_BINARY_DIR}/boot/bootdata/packages/reactos.dff.dyn "${__relative_file} ${_num}\n") else() - file(APPEND ${REACTOS_BINARY_DIR}/boot/bootdata/packages/reactos.dff.dyn ""${_CD_FILE}" ${_num}\n") - endif() + file(APPEND ${REACTOS_BINARY_DIR}/boot/bootdata/packages/reactos.dff.dyn ""${__relative_file}" ${_num}\n") + endif() + unset(__relative_file) if(_CD_TARGET) #manage dependency add_dependencies(reactos_cab ${_CD_TARGET})