From 258c588b442b79a28f4ad081e027e6e4afc261c0 Mon Sep 17 00:00:00 2001
From: Marshall Greenblatt <magreenblatt@gmail.com>
Date: Fri, 18 Nov 2016 13:32:52 -0500
Subject: [PATCH] Mac: Fix resource copy when building the binary distrib with
 Ninja (issue #1632)

---
 tests/cefclient/CMakeLists.txt.in | 7 ++++++-
 tests/ceftests/CMakeLists.txt.in  | 6 +++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/tests/cefclient/CMakeLists.txt.in b/tests/cefclient/CMakeLists.txt.in
index c9f937919..7b1d711ac 100644
--- a/tests/cefclient/CMakeLists.txt.in
+++ b/tests/cefclient/CMakeLists.txt.in
@@ -217,7 +217,12 @@ if(OS_MACOSX)
   if(NOT ${CMAKE_GENERATOR} STREQUAL "Xcode")
     # Manually process and copy over resource files.
     # The Xcode generator handles this via the set_target_properties RESOURCE directive.
-    set(PREFIXES "resources/mac/" "resources/")  # Remove these prefixes from input file paths.
+    # Remove these prefixes from input file paths.
+    set(PREFIXES
+      "resources/mac/"
+      "resources/"
+      "../shared/resources/"
+      )
     COPY_MACOSX_RESOURCES("${CEFCLIENT_RESOURCES_SRCS}" "${PREFIXES}" "${CEF_TARGET}" "${CMAKE_CURRENT_SOURCE_DIR}" "${CEF_APP}")
   endif()
 endif()
diff --git a/tests/ceftests/CMakeLists.txt.in b/tests/ceftests/CMakeLists.txt.in
index 8c50d85e0..099bfca04 100644
--- a/tests/ceftests/CMakeLists.txt.in
+++ b/tests/ceftests/CMakeLists.txt.in
@@ -153,7 +153,11 @@ if(OS_MACOSX)
   if(NOT ${CMAKE_GENERATOR} STREQUAL "Xcode")
     # Manually process and copy over resource files.
     # The Xcode generator handles this via the set_target_properties RESOURCE directive.
-    set(PREFIXES "mac/")  # Remove these prefixes from input file paths.
+    # Remove these prefixes from input file paths.
+    set(PREFIXES
+      "resources/mac/"
+      "../shared/resources/"
+      )
     COPY_MACOSX_RESOURCES("${UNITTESTS_RESOURCES_SRCS}" "${PREFIXES}" "${CEF_TARGET}" "${CMAKE_CURRENT_SOURCE_DIR}" "${CEF_APP}")
   endif()
 endif()