kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Clean up and improve fc_copy_sources and fc_target_copy_resource CMake macros

Browse Source 
The previous steps of TO_NATIVE_PATH followed by ABSOLUTE
is not meaningful or reliable: output of ABSOLUTE is always in
"cmake" path format, not native path format. Native path input to
CMake commands may not do what you want.
This commit is contained in:
Ryan Pavlik
2018-06-15 11:49:39 -05:00
committed by wmayer
parent 11d89c7608
commit 4ffc6c2882
1 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
cMake/FreeCadMacros.cmake
View File

@@ -42,16 +42,14 @@ ENDMACRO(COPY_IF_DIFFERENT FROM_DIR TO_DIR FILES TARGETS TAGS)
MACRO (fc_copy_sources target_name outpath)
foreach(it ${ARGN})
file(TO_NATIVE_PATH "${outpath}/${it}" outfile)
get_filename_component(infile ${it} ABSOLUTE)
get_filename_component(outfile ${outfile} ABSOLUTE)
add_file_dependencies(${infile} ${outfile})
get_filename_component(outfile "${outpath}/${it}" ABSOLUTE)
add_file_dependencies("${infile}" "${outfile}")
ADD_CUSTOM_COMMAND(
SOURCE ${infile}
COMMAND ${CMAKE_COMMAND}
ARGS -E copy ${infile} ${outfile}
SOURCE "${infile}"
COMMAND "${CMAKE_COMMAND}" -E copy "${infile}" "${outfile}"
TARGET ${target_name}
OUTPUTS ${outfile}
OUTPUTS "${outfile}"
)
endforeach(it)
ADD_CUSTOM_COMMAND(
@@ -63,17 +61,14 @@ ENDMACRO(fc_copy_sources)
MACRO (fc_target_copy_resource target_name inpath outpath)
foreach(it ${ARGN})
file(TO_NATIVE_PATH "${inpath}/${it}" infile)
file(TO_NATIVE_PATH "${outpath}/${it}" outfile)
get_filename_component(infile ${infile} ABSOLUTE)
get_filename_component(outfile ${outfile} ABSOLUTE)
add_file_dependencies(${infile} ${outfile})
get_filename_component(infile "${inpath}/${it}" ABSOLUTE)
get_filename_component(outfile "${outpath}/${it}" ABSOLUTE)
add_file_dependencies("${infile}" "${outfile}")
ADD_CUSTOM_COMMAND(
SOURCE ${infile}
COMMAND ${CMAKE_COMMAND}
ARGS -E copy ${infile} ${outfile}
SOURCE "${infile}"
COMMAND "${CMAKE_COMMAND}" -E copy "${infile}" "${outfile}"
TARGET ${target_name}
OUTPUTS ${outfile}
OUTPUTS "${outfile}"
)
endforeach(it)
ADD_CUSTOM_COMMAND(