From 85a5b72ec501c8dbb1ea154fcdfb3633a221031d Mon Sep 17 00:00:00 2001 From: John Colvin Date: Fri, 9 Aug 2024 15:50:15 +0000 Subject: [PATCH] build: Clean up data_files cmake proj (support --target clean) --- src/data_files/CMakeLists.txt | 39 +++++++++++++++++++++++-------- src/data_files/copy_data_files.sh | 8 +++---- 2 files changed, 33 insertions(+), 14 deletions(-) mode change 100644 => 100755 src/data_files/copy_data_files.sh diff --git a/src/data_files/CMakeLists.txt b/src/data_files/CMakeLists.txt index 0eba61e60..9b36fb566 100644 --- a/src/data_files/CMakeLists.txt +++ b/src/data_files/CMakeLists.txt @@ -3,16 +3,35 @@ project(data_files) include(${CMAKE_SOURCE_DIR}/cmake/safe_dep_glob.cmake) -# dependencies -file (GLOB_RECURSE To_Copy RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} files/*) -update_deps_file("${To_Copy}") +# Dependencies +file( + GLOB_RECURSE ${PROJECT_NAME}_Sources + RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + files/* +) +update_deps_file("${${PROJECT_NAME}_Sources}") +# Outputs +list( + TRANSFORM ${PROJECT_NAME}_Sources + REPLACE "^files/" "" + OUTPUT_VARIABLE ${PROJECT_NAME}_Sources_Out +) +list( + TRANSFORM ${PROJECT_NAME}_Sources_Out + REPLACE "\\.xz$" "" +) +list( + TRANSFORM ${PROJECT_NAME}_Sources_Out + PREPEND ${CMAKE_CURRENT_BINARY_DIR}/ +) -add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/data_files - COMMAND /bin/bash ${CMAKE_CURRENT_SOURCE_DIR}/copy_data_files.sh - ARGS ${CMAKE_BINARY_DIR}/data_files ${CMAKE_CURRENT_SOURCE_DIR} +set(copy_data_files_sh ${CMAKE_CURRENT_SOURCE_DIR}/copy_data_files.sh) +add_custom_command( + OUTPUT ${${PROJECT_NAME}_Sources_Out} + COMMAND /bin/bash ${copy_data_files_sh} + ARGS ${CMAKE_CURRENT_SOURCE_DIR}/files ${CMAKE_CURRENT_BINARY_DIR} COMMENT "Copying data files" - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/copy_data_files.sh ${To_Copy}) - -add_custom_target(data_files_dir ALL DEPENDS ${CMAKE_BINARY_DIR}/data_files) - + DEPENDS ${copy_data_files_sh} ${${PROJECT_NAME}_Sources} +) +add_custom_target(data_files_dir ALL DEPENDS ${${PROJECT_NAME}_Sources_Out}) diff --git a/src/data_files/copy_data_files.sh b/src/data_files/copy_data_files.sh old mode 100644 new mode 100755 index cdce7beaa..0d6efe03f --- a/src/data_files/copy_data_files.sh +++ b/src/data_files/copy_data_files.sh @@ -1,10 +1,10 @@ #!/bin/bash -rm -rf $1 -mkdir $1 -cp -r $2/files/* $1 +source=$1 +dest=$2 +cp -r $source/* $dest -for filename in $1/*; do +for filename in $dest/*; do if [[ $filename == *.xz ]]; then unxz $filename fi