Revision: 77378
http://sourceforge.net/p/brlcad/code/77378
Author: starseeker
Date: 2020-10-09 13:17:05 +0000 (Fri, 09 Oct 2020)
Log Message:
-----------
Adjust dependency setup for file copying
Modified Paths:
--------------
brlcad/branches/thirdparty_rework/src/superbuild/CMake/ExternalProject_Target.cmake
Modified:
brlcad/branches/thirdparty_rework/src/superbuild/CMake/ExternalProject_Target.cmake
===================================================================
---
brlcad/branches/thirdparty_rework/src/superbuild/CMake/ExternalProject_Target.cmake
2020-10-09 12:55:20 UTC (rev 77377)
+++
brlcad/branches/thirdparty_rework/src/superbuild/CMake/ExternalProject_Target.cmake
2020-10-09 13:17:05 UTC (rev 77378)
@@ -39,11 +39,11 @@
file(WRITE "${CMAKE_BINARY_DIR}/CMakeFiles/cp.cmake"
"get_filename_component(DDIR \${DEST} DIRECTORY)\nfile(COPY \${SRC} DESTINATION
\${DDIR})")
function(fcfgcpy outvar extproj root dir ofile tfile)
- #message("extproj: ${extproj}")
- #message("root: ${root}")
- #message("dir: ${dir}")
- #message("ofile: ${ofile}")
- #message("tfile: ${tfile}")
+ message("extproj: ${extproj}")
+ message("root: ${root}")
+ message("dir: ${dir}")
+ message("ofile: ${ofile}")
+ message("tfile: ${tfile}")
if (NOT CMAKE_CONFIGURATION_TYPES)
add_custom_command(
OUTPUT "${CMAKE_BINARY_DIR}/${dir}/${tfile}"
@@ -94,7 +94,10 @@
endif (EXTPROJ_VERBOSE)
- unset(TOUT)
+ if (NOT TARGET ${etarg}_stage)
+ add_custom_target(${etarg}_stage ALL)
+ endif (NOT TARGET ${etarg}_stage)
+
foreach (bpf ${E_UNPARSED_ARGUMENTS})
# If a relative prefix was specified, construct the "source" file using it.
# This is used to save verbosity in ByProducts input lists.
@@ -104,7 +107,11 @@
set(ofile ${bpf})
endif (E_IMPORT_PREFIX)
+ unset(TOUT)
fcfgcpy(TOUT ${extproj} ${extroot} "${target_dir}" ${ofile} ${bpf})
+ string(MD5 UKEY "${TOUT}")
+ add_custom_target(${etarg}_${UKEY} ALL DEPENDS ${TOUT})
+ add_dependencies(${etarg}_stage ${etarg}_${UKEY})
install(FILES "${CMAKE_BINARY_DIR}/$<CONFIG>/${target_dir}/${bpf}"
DESTINATION "${target_dir}/")
if (E_FIXPATH)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
