From 2d2513369a5ef77d509f54aee0d4c7488093f296 Mon Sep 17 00:00:00 2001
From: Shyotl <Shyotl@gmail.com>
Date: Sun, 28 Dec 2014 00:20:30 -0600
Subject: [PATCH] OSX poking.

---
 indra/cmake/LLSharedLibs.cmake | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/indra/cmake/LLSharedLibs.cmake b/indra/cmake/LLSharedLibs.cmake
index 8d31d9e77..982b2d3f7 100644
--- a/indra/cmake/LLSharedLibs.cmake
+++ b/indra/cmake/LLSharedLibs.cmake
@@ -1,17 +1,13 @@
 # ll_deploy_sharedlibs_command
 # target_exe: the cmake target of the executable for which the shared libs will be deployed.
 macro(ll_deploy_sharedlibs_command target_exe) 
-  SET(TARGET_LOCATION $<TARGET_FILE:${target_exe}>)
-  get_filename_component(OUTPUT_PATH ${TARGET_LOCATION} PATH)
+  SET(OUTPUT_PATH $<TARGET_FILE:${target_exe}>)
   
   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)
@@ -26,7 +22,7 @@ macro(ll_deploy_sharedlibs_command target_exe)
     TARGET ${target_exe} POST_BUILD
     COMMAND ${CMAKE_COMMAND} 
     ARGS
-    "-DBIN_NAME=\"${TARGET_LOCATION}\""
+    "-DBIN_NAME=\"$<TARGET_FILE:${target_exe}>\""
     "-DSEARCH_DIRS=\"${SEARCH_DIRS}\""
     "-DDST_PATH=\"${OUTPUT_PATH}\""
     "-P"