Skip to content

Commit 4115d8b

Browse files
committed
Create separate directories for genetare.stamp
This avoid writing to the same generate.stamp while building UMF
1 parent f0a34f6 commit 4115d8b

File tree

1 file changed

+12
-4
lines changed

1 file changed

+12
-4
lines changed

test/CMakeLists.txt

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -145,10 +145,18 @@ function(add_umf_test)
145145
set_tests_properties(${TEST_NAME} PROPERTIES LABELS "umf")
146146

147147
if(WINDOWS)
148-
# add PATH to DLL on Windows
149-
set(DLL_PATH_LIST
150-
"${DLL_PATH_LIST};PATH=path_list_append:${CMAKE_BINARY_DIR}/bin/;PATH=path_list_append:${CMAKE_BINARY_DIR}/bin/$<CONFIG>/"
151-
)
148+
set(TEST_CMAKEFILES_DIR
149+
${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles_${ARG_NAME})
150+
set(TEST_GENERATE_STAMP_FILE ${TEST_CMAKEFILES_DIR}/generate.stamp)
151+
152+
add_custom_command(
153+
OUTPUT ${TEST_GENERATE_STAMP_FILE}
154+
COMMAND ${CMAKE_COMMAND} -E touch ${TEST_GENERATE_STAMP_FILE})
155+
156+
# generate.stamp is generated before build
157+
add_custom_target(${TEST_TARGET_NAME}_custom_stamp
158+
DEPENDS ${TEST_GENERATE_STAMP_FILE})
159+
add_dependencies(${TEST_TARGET_NAME} ${TEST_TARGET_NAME}_custom_stamp)
152160

153161
# append PATH to DLLs
154162
set_property(TEST ${TEST_NAME} PROPERTY ENVIRONMENT_MODIFICATION

0 commit comments

Comments
 (0)