From a579b5f6406b13a56cb766365278a19663092d88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Ho=C5=99e=C5=88ovsk=C3=BD?= Date: Tue, 13 Aug 2024 23:05:21 +0200 Subject: [PATCH] Properly handle prepending user-specified paths to DYLD_FRAMEWORK_PATH --- extras/CatchAddTests.cmake | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/extras/CatchAddTests.cmake b/extras/CatchAddTests.cmake index da302a4a..399a839d 100644 --- a/extras/CatchAddTests.cmake +++ b/extras/CatchAddTests.cmake @@ -65,7 +65,9 @@ function(catch_discover_tests_impl) endif() 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}") endif() @@ -133,7 +135,7 @@ function(catch_discover_tests_impl) if(APPLE AND dl_framework_paths) foreach(path ${dl_framework_paths}) 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() endif()