build: Copy libspark to all dotnet dirs in single cmake target

This is cleaner than the previous impl, which used separate build
targets to copy libspark to "net7.0", and "net7.0-windows" (dirs).

Note: I decided to clean this up now because I'm about to upgrade the
new DataStream WebApp to net8.0, and did not want to add yet another
build target to copy libspark to "net8.0".
This commit is contained in:
John Colvin committed 2024-06-26 14:33:04 -04:00
1 parent 9ab39587e2
commit 322152c743
3 files changed
+15 -17

No files matched your search

+2 -2
View File
@@ -31,8 +31,7 @@
"CMAKE_TOOLCHAIN_FILE": "${sourceDir}/vcpkg/scripts/buildsystems/vcpkg.cmake",
"EXTERNALS_ROOT": "${sourceDir}/externals/windows",
"CONFIG_DEFAULTS_PATH": "config/profiles/default/*.conf",
"DOTNET_BINARY_DIR": "${sourceDir}/build/$<CONFIG>/bin/net7.0",
"DOTNET_WINDOWS_BINARY_DIR": "${sourceDir}/build/$<CONFIG>/bin/net7.0-windows",
"DOTNET_BINARY_DIR": "${sourceDir}/build/$<CONFIG>/bin/net7.0;${sourceDir}/build/$<CONFIG>/bin/net7.0-windows",
"EXPORT_MD_CONSUMER": {
"type": "BOOL",
"value": "ON"
@@ -222,6 +221,7 @@
"APP_DATA_DIR": "${dollar}{APPDATA}/bts/DataStream",
"APP_DATA_DIR_OVERRIDE": "${dollar}{DATA_STREAM_DATA_DIR}",
"CONFIG_DEFAULTS_PATH": "config/profiles/default/*.conf;config/profiles/data_stream/*.conf",
"DOTNET_BINARY_DIR": "${sourceDir}/build/$<CONFIG>/bin/net7.0;${sourceDir}/build/$<CONFIG>/bin/net7.0-windows;${sourceDir}/build/$<CONFIG>/bin/net8.0",
"SHARED_MEMORY_PREFIX": "data_stream"
}
},
-6
View File
@@ -64,12 +64,6 @@ if (DEFINED DOTNET_BINARY_DIR)
${DOTNET_BINARY_DIR}
"Copy ${PROJECT_NAME} bins to Dotnet build dir")
endif()
if (DEFINED DOTNET_WINDOWS_BINARY_DIR)
add_copy_binaries_target(
copy_to_dotnet_windows_binary_dir
${DOTNET_WINDOWS_BINARY_DIR}
"Copy ${PROJECT_NAME} bins to Dotnet Windows build dir")
endif()
if(BUILD_SPARKD)
install(TARGETS ${PROJECT_NAME} DESTINATION "${SPARK_INSTALL_PREFIX}/bin")
+13 -9
View File
@@ -1,11 +1,15 @@
function(add_copy_binaries_target tgt_name dest_dir)
set(_output ${dest_dir}/${PROJECT_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX})
add_custom_command(
OUTPUT ${_output}
COMMAND ${CMAKE_COMMAND}
ARGS -E copy
${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/${PROJECT_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}
${dest_dir}/${PROJECT_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}
DEPENDS ${PROJECT_NAME})
add_custom_target(${tgt_name} ALL DEPENDS ${_output} COMMENT ${ARGN})
set(_dest_files)
foreach (_dest_dir ${dest_dir})
set(_dest_file ${_dest_dir}/${PROJECT_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX})
list(APPEND _dest_files ${_dest_file})
add_custom_command(
OUTPUT ${_dest_file}
COMMAND ${CMAKE_COMMAND}
ARGS -E copy
${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/${PROJECT_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}
${_dest_file}
DEPENDS ${PROJECT_NAME})
endforeach()
add_custom_target(${tgt_name} ALL DEPENDS ${_dest_files} COMMENT ${ARGN})
endfunction()