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

Properly handle prepending user-specified paths to DYLD_FRAMEWORK_PATH

Browse Source
This commit is contained in:
Martin Hořeňovský 2024-08-13 23:05:21 +02:00
parent 1538be67cb
commit a579b5f640
No known key found for this signature in database
GPG Key ID: DE48307B8B0D381A
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
extras/CatchAddTests.cmake
View File

@ -65,7 +65,9 @@ function(catch_discover_tests_impl)
endif() endif()
if(APPLE AND dl_framework_paths) if(APPLE AND dl_framework_paths)
cmake_path(CONVERT "${dl_framework_paths}" TO_NATIVE_PATH_LIST paths) cmake_path(CONVERT "$ENV{DYLD_FRAMEWORK_PATH}" TO_NATIVE_PATH_LIST env_dl_framework_paths)
list(PREPEND env_dl_framework_paths "${dl_framework_paths}")
cmake_path(CONVERT "${env_dl_framework_paths}" TO_NATIVE_PATH_LIST paths)
set(ENV{DYLD_FRAMEWORK_PATH} "${paths}") set(ENV{DYLD_FRAMEWORK_PATH} "${paths}")
endif() endif()
@ -133,7 +135,7 @@ function(catch_discover_tests_impl)
if(APPLE AND dl_framework_paths) if(APPLE AND dl_framework_paths)
foreach(path ${dl_framework_paths}) foreach(path ${dl_framework_paths})
cmake_path(NATIVE_PATH path native_path) cmake_path(NATIVE_PATH path native_path)
list(APPEND environment_modifications "DYLD_FRAMEWORK_PATH=path_list_prepend:${native_path}") list(PREPEND environment_modifications "DYLD_FRAMEWORK_PATH=path_list_prepend:${native_path}")
endforeach() endforeach()
endif() endif()