Properly handle prepending user-specified paths to DYLD_FRAMEWORK_PATH

catchorg · Aug 13, 2024 · a579b5f · a579b5f
1 parent 1538be6
commit a579b5f
Showing 1 changed file with 4 additions and 2 deletions.
diff --git 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()