Skip to content

Commit c69100f

Browse files
committed
fix
1 parent 37ec2fe commit c69100f

File tree

2 files changed

+17
-20
lines changed

2 files changed

+17
-20
lines changed

.github/workflows/windows.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ jobs:
3939
cmake -S ./ -B ./build \
4040
-DCMAKE_INSTALL_PREFIX=$CONDA_PREFIX \
4141
-DCMAKE_PREFIX_PATH=$GLOB_PREFIX_PATH \
42-
-DCMAKE_LIBRARY_PATH=$GLOB_PREFIX_PATH \
4342
-DSPARROW_IPC_BUILD_SHARED=${{ matrix.build_shared }} \
4443
-DSPARROW_IPC_BUILD_TESTS=ON
4544

tests/CMakeLists.txt

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -27,25 +27,23 @@ target_link_libraries(${test_target}
2727
)
2828

2929
if(WIN32)
30-
if(${SPARROW_IPC_BUILD_SHARED})
31-
find_package(date) # For copying DLLs
32-
add_custom_command(
33-
TARGET ${test_target} POST_BUILD
34-
COMMAND ${CMAKE_COMMAND} -E copy
35-
"$<TARGET_FILE:sparrow::sparrow>"
36-
"$<TARGET_FILE_DIR:${test_target}>"
37-
COMMAND ${CMAKE_COMMAND} -E copy
38-
"$<TARGET_FILE:sparrow-ipc>"
39-
"$<TARGET_FILE_DIR:${test_target}>"
40-
COMMAND ${CMAKE_COMMAND} -E copy
41-
"$<TARGET_FILE:sparrow::json_reader>"
42-
"$<TARGET_FILE_DIR:${test_target}>"
43-
COMMAND ${CMAKE_COMMAND} -E copy
44-
"$<TARGET_FILE:date::date-tz>"
45-
"$<TARGET_FILE_DIR:${test_target}>"
46-
COMMENT "Copying sparrow and sparrow-ipc DLLs to executable directory"
47-
)
48-
endif()
30+
find_package(date) # For copying DLLs
31+
add_custom_command(
32+
TARGET ${test_target} POST_BUILD
33+
COMMAND ${CMAKE_COMMAND} -E copy
34+
"$<TARGET_FILE:sparrow::sparrow>"
35+
"$<TARGET_FILE_DIR:${test_target}>"
36+
COMMAND ${CMAKE_COMMAND} -E copy
37+
"$<TARGET_FILE:sparrow-ipc>"
38+
"$<TARGET_FILE_DIR:${test_target}>"
39+
COMMAND ${CMAKE_COMMAND} -E copy
40+
"$<TARGET_FILE:sparrow::json_reader>"
41+
"$<TARGET_FILE_DIR:${test_target}>"
42+
COMMAND ${CMAKE_COMMAND} -E copy
43+
"$<TARGET_FILE:date::date-tz>"
44+
"$<TARGET_FILE_DIR:${test_target}>"
45+
COMMENT "Copying sparrow and sparrow-ipc DLLs to executable directory"
46+
)
4947
endif()
5048

5149
target_include_directories(${test_target}

0 commit comments

Comments
 (0)