Automated merge with ssh://bitbucket.org/lindenlab/viewer64

1 files changed, 31 insertions, 28 deletions

diff --git a/indra/cmake/LLSharedLibs.cmake b/indra/cmake/LLSharedLibs.cmake
index a3c1c871aa..f69b45cd92 100644
--- a/indra/cmake/LLSharedLibs.cmake
+++ b/indra/cmake/LLSharedLibs.cmake
@@ -3,35 +3,38 @@
 macro(ll_deploy_sharedlibs_command target_exe) 
   set(TARGET_LOCATION $<TARGET_FILE:${target_exe}>)
   get_filename_component(OUTPUT_PATH ${TARGET_LOCATION} PATH)
-  
-  if(DARWIN)
-    SET_TEST_PATH(SEARCH_DIRS)
-    get_target_property(IS_BUNDLE ${target_exe} MACOSX_BUNDLE)
-    if(IS_BUNDLE)
-      # If its a bundle the exe is not in the target location, this should find it.
-      get_filename_component(TARGET_FILE ${TARGET_LOCATION} NAME)
-      set(OUTPUT_PATH ${TARGET_LOCATION}.app/Contents/MacOS)
-      set(TARGET_LOCATION ${OUTPUT_PATH}/${TARGET_FILE})
-      set(OUTPUT_PATH ${OUTPUT_PATH}/../Resources)
-    endif(IS_BUNDLE)
-  elseif(WINDOWS)
-    SET_TEST_PATH(SEARCH_DIRS)
-    LIST(APPEND SEARCH_DIRS "$ENV{SystemRoot}/system32")
-  elseif(LINUX)
-    SET_TEST_PATH(SEARCH_DIRS)
-    set(OUTPUT_PATH ${OUTPUT_PATH}/lib)
-  endif(DARWIN)
 
-  add_custom_command(
-    TARGET ${target_exe} POST_BUILD
-    COMMAND ${CMAKE_COMMAND} 
-    ARGS
-    "-DBIN_NAME=\"${TARGET_LOCATION}\""
-    "-DSEARCH_DIRS=\"${SEARCH_DIRS}\""
-    "-DDST_PATH=\"${OUTPUT_PATH}\""
-    "-P"
-    "${CMAKE_SOURCE_DIR}/cmake/DeploySharedLibs.cmake"
-    )
+  # It's not clear that this does anything useful for us on Darwin. It has
+  # been broken for some time now; the BIN_NAME was being constructed as a
+  # ridiculous nonexistent path with duplicated segments. Fixing that only
+  # produces ominous spammy warnings: at the time the command below is run, we
+  # have not yet populated the nested mac-crash-logger.app/Contents/Resources
+  # with the .dylibs with which it was linked. Moreover, the form of the
+  # embedded @executable_path/../Resources/mumble.dylib pathname confuses the
+  # GetPrerequisites.cmake tool invoked by DeploySharedLibs.cmake. It seems
+  # clear that we have long since accomplished by other means what this was
+  # originally supposed to do. Skipping it only eliminates an annoying
+  # non-fatal error.
+  if(NOT DARWIN)
+    if(WINDOWS)
+      SET_TEST_PATH(SEARCH_DIRS)
+      LIST(APPEND SEARCH_DIRS "$ENV{SystemRoot}/system32")
+    elseif(LINUX)
+      SET_TEST_PATH(SEARCH_DIRS)
+      set(OUTPUT_PATH ${OUTPUT_PATH}/lib)
+    endif(WINDOWS)
+
+    add_custom_command(
+      TARGET ${target_exe} POST_BUILD
+      COMMAND ${CMAKE_COMMAND} 
+      ARGS
+      "-DBIN_NAME=\"${TARGET_LOCATION}\""
+      "-DSEARCH_DIRS=\"${SEARCH_DIRS}\""
+      "-DDST_PATH=\"${OUTPUT_PATH}\""
+      "-P"
+      "${CMAKE_SOURCE_DIR}/cmake/DeploySharedLibs.cmake"
+      )
+  endif(NOT DARWIN)
 
 endmacro(ll_deploy_sharedlibs_command)