From 13e805ac15f4ccf8ccefc51e9d722344adc8b8e4 Mon Sep 17 00:00:00 2001
From: Brad Hefta-Gaub <brad@highfidelity.io>
Date: Sun, 1 Nov 2015 13:18:53 -0800
Subject: [PATCH] replace copy_resolved_item_into_bundle with a version that
 doesn't report warnings for a status case

---
 cmake/templates/FixupBundlePostBuild.cmake.in | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/cmake/templates/FixupBundlePostBuild.cmake.in b/cmake/templates/FixupBundlePostBuild.cmake.in
index 7d98e9796c..4afe4de403 100644
--- a/cmake/templates/FixupBundlePostBuild.cmake.in
+++ b/cmake/templates/FixupBundlePostBuild.cmake.in
@@ -10,5 +10,35 @@
 # 
 
 include(BundleUtilities)
+
+
+# replace copy_resolved_item_into_bundle 
+#
+# The official version of copy_resolved_item_into_bundle will print out a "warning:" when
+# the resolved item matches the resolved embedded item. This not not really an issue that
+# should rise to the level of a "warning" so we replace this message with a "status:"
+#
+function(copy_resolved_item_into_bundle resolved_item resolved_embedded_item)
+    if(WIN32)
+        # ignore case on Windows
+        string(TOLOWER "${resolved_item}" resolved_item_compare)
+        string(TOLOWER "${resolved_embedded_item}" resolved_embedded_item_compare)
+    else()
+        set(resolved_item_compare "${resolved_item}")
+        set(resolved_embedded_item_compare "${resolved_embedded_item}")
+    endif()
+
+    if("${resolved_item_compare}" STREQUAL "${resolved_embedded_item_compare}")
+        # this is our only change from the original version
+        message(STATUS "status: resolved_item == resolved_embedded_item - not copying...")
+    else()
+        #message(STATUS "copying COMMAND ${CMAKE_COMMAND} -E copy ${resolved_item} ${resolved_embedded_item}")
+        execute_process(COMMAND ${CMAKE_COMMAND} -E copy "${resolved_item}" "${resolved_embedded_item}")
+        if(UNIX AND NOT APPLE)
+            file(RPATH_REMOVE FILE "${resolved_embedded_item}")
+        endif()
+    endif()
+endfunction()
+
 message(STATUS "FIXUP_LIBS for fixup_bundle called for bundle ${BUNDLE_EXECUTABLE} are @FIXUP_LIBS@")
 fixup_bundle("${BUNDLE_EXECUTABLE}" "" "@FIXUP_LIBS@")
\ No newline at end of file