Skip to content

Commit 85e97af

Browse files
committed
set path to umf.dll in ctest for Win
1 parent e401aa1 commit 85e97af

File tree

2 files changed

+7
-0
lines changed

2 files changed

+7
-0
lines changed

src/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,8 @@ if(UMF_BUILD_SHARED_LIBRARY)
5151
SRCS ${UMF_SOURCES}
5252
LIBS ${UMF_LIBS})
5353
target_compile_definitions(umf PUBLIC UMF_SHARED_LIBRARY)
54+
set_target_properties(umf PROPERTIES
55+
RUNTIME_OUTPUT_DIRECTORY ${CMAKE_UMF_OUTPUT_DIRECTORY})
5456
else()
5557
add_umf_library(NAME umf
5658
TYPE STATIC

test/CMakeLists.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,11 @@ function(add_umf_test)
5353

5454
set_tests_properties(${TEST_NAME} PROPERTIES LABELS "umf")
5555

56+
if(WIN32)
57+
set_property(TEST ${TEST_NAME} PROPERTY ENVIRONMENT_MODIFICATION
58+
"PATH=path_list_append:../bin/$<CONFIG>")
59+
endif()
60+
5661
if (UMF_ENABLE_POOL_TRACKING)
5762
target_compile_definitions(${TEST_TARGET_NAME} PRIVATE UMF_ENABLE_POOL_TRACKING_TESTS=1)
5863
endif()

0 commit comments

Comments
 (0)