3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2024-11-16 10:42:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Respect path order of DL_PATHS in catch_discover_tests function

Browse Source
This commit is contained in:
Chien-Yu Lin 2024-06-21 14:36:04 +08:00 committed by Martin Hořeňovský
parent 9721048a32
commit 1538be67cb
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
extras/CatchAddTests.cmake
View File

@ -37,6 +37,7 @@ function(catch_discover_tests_impl)
set(output_suffix ${_TEST_OUTPUT_SUFFIX}) set(output_suffix ${_TEST_OUTPUT_SUFFIX})
set(dl_paths ${_TEST_DL_PATHS}) set(dl_paths ${_TEST_DL_PATHS})
set(dl_framework_paths ${_TEST_DL_FRAMEWORK_PATHS}) set(dl_framework_paths ${_TEST_DL_FRAMEWORK_PATHS})
set(environment_modifications "")
set(script) set(script)
set(suite) set(suite)
set(tests) set(tests)
@ -57,7 +58,9 @@ function(catch_discover_tests_impl)
endif() endif()
if(dl_paths) if(dl_paths)
cmake_path(CONVERT "${dl_paths}" TO_NATIVE_PATH_LIST paths) cmake_path(CONVERT "$ENV{${dl_paths_variable_name}}" TO_NATIVE_PATH_LIST env_dl_paths)
list(PREPEND env_dl_paths "${dl_paths}")
cmake_path(CONVERT "${env_dl_paths}" TO_NATIVE_PATH_LIST paths)
set(ENV{${dl_paths_variable_name}} "${paths}") set(ENV{${dl_paths_variable_name}} "${paths}")
endif() endif()
@ -123,7 +126,7 @@ function(catch_discover_tests_impl)
if(dl_paths) if(dl_paths)
foreach(path ${dl_paths}) foreach(path ${dl_paths})
cmake_path(NATIVE_PATH path native_path) cmake_path(NATIVE_PATH path native_path)
list(APPEND environment_modifications "${dl_paths_variable_name}=path_list_prepend:${native_path}") list(PREPEND environment_modifications "${dl_paths_variable_name}=path_list_prepend:${native_path}")
endforeach() endforeach()
endif() endif()