File tree Expand file tree Collapse file tree 2 files changed +15
-5
lines changed Expand file tree Collapse file tree 2 files changed +15
-5
lines changed Original file line number Diff line number Diff line change @@ -26,7 +26,8 @@ with section("parse"):
26
26
'kwargs': {
27
27
'NAME': '*',
28
28
'SRCS': '*',
29
- 'LIBS': '*'}},
29
+ 'LIBS': '*',
30
+ 'CFGS': '*',}},
30
31
'add_umf_library': {
31
32
"pargs": 0,
32
33
"flags": [],
Original file line number Diff line number Diff line change @@ -30,7 +30,7 @@ function(add_umf_test)
30
30
# * SRCS - source files
31
31
# * LIBS - libraries to be linked with
32
32
set (oneValueArgs NAME )
33
- set (multiValueArgs SRCS LIBS )
33
+ set (multiValueArgs SRCS LIBS CFGS )
34
34
cmake_parse_arguments (
35
35
ARG
36
36
""
@@ -73,6 +73,7 @@ function(add_umf_test)
73
73
add_test (
74
74
NAME ${TEST_NAME}
75
75
COMMAND ${TEST_TARGET_NAME}
76
+ CONFIGURATIONS ${ARG_CFGS}
76
77
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} )
77
78
78
79
set_tests_properties (${TEST_NAME} PROPERTIES LABELS "umf" )
@@ -223,14 +224,22 @@ add_umf_test(
223
224
224
225
# tests for the proxy library
225
226
if (UMF_PROXY_LIB_ENABLED AND UMF_BUILD_SHARED_LIBRARY )
227
+ # The CFGS variable can be removed when the issue of running the proxy
228
+ # library on Windows with Debug configuration is fixed.
229
+ if (WINDOWS )
230
+ set (CONFIGS Release RelWithDebInfo MinSizeRel )
231
+ else ()
232
+ set (CONFIGS Debug Release RelWithDebInfo MinSizeRel )
233
+ endif ()
226
234
add_umf_test (
227
235
NAME proxy_lib_basic
228
236
SRCS test_proxy_lib.cpp
229
- LIBS umf_proxy )
230
-
237
+ LIBS umf_proxy
238
+ CFGS ${CONFIGS} )
231
239
# the memoryPool test run with the proxy library
232
240
add_umf_test (
233
241
NAME proxy_lib_memoryPool
234
242
SRCS memoryPoolAPI.cpp malloc_compliance_tests.cpp
235
- LIBS umf_proxy )
243
+ LIBS umf_proxy
244
+ CFGS ${CONFIGS} )
236
245
endif ()
You can’t perform that action at this time.
0 commit comments