2 files changed, 15 insertions, 22 deletions
diff --git a/indra/llplugin/CMakeLists.txt b/indra/llplugin/CMakeLists.txt
index 14a69afe6e..005426acde 100644
--- a/indra/llplugin/CMakeLists.txt
+++ b/indra/llplugin/CMakeLists.txt
@@ -31,14 +31,6 @@ set(llplugin_HEADER_FILES
     llpluginsharedmemory.h
     )
 
-if(NOT ADDRESS_SIZE EQUAL 32)
-  if(WINDOWS)
-    ##add_definitions(/FIXED:NO)
-  else(WINDOWS) # not windows therefore gcc LINUX and DARWIN
-    add_definitions(-fPIC)
-  endif(WINDOWS)
-endif(NOT ADDRESS_SIZE EQUAL 32)
-
 list(APPEND llplugin_SOURCE_FILES ${llplugin_HEADER_FILES})
 
 add_library (llplugin ${llplugin_SOURCE_FILES})
diff --git a/indra/llplugin/slplugin/CMakeLists.txt b/indra/llplugin/slplugin/CMakeLists.txt
index 0ea6495eac..4df3e306cb 100644
--- a/indra/llplugin/slplugin/CMakeLists.txt
+++ b/indra/llplugin/slplugin/CMakeLists.txt
@@ -30,18 +30,6 @@ add_executable(SLPlugin
     ${SLPlugin_SOURCE_FILES}
     )
 
-if (WINDOWS)
-set_target_properties(SLPlugin
-  PROPERTIES
-  LINK_FLAGS_DEBUG "/NODEFAULTLIB:\"LIBCMTD\""
-  )
-else ()
-set_target_properties(SLPlugin
-  PROPERTIES
-  MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/slplugin_info.plist
-  )
-endif ()
-
 target_link_libraries(SLPlugin
         llplugin
         llmessage
@@ -49,7 +37,20 @@ target_link_libraries(SLPlugin
         ll::pluginlibraries
         )
 
-if (DARWIN)
+if (WINDOWS)
+  set_target_properties(SLPlugin
+    PROPERTIES
+    LINK_FLAGS_DEBUG "/NODEFAULTLIB:\"LIBCMTD\""
+    )
+elseif (DARWIN)
+  set_target_properties(SLPlugin
+    PROPERTIES
+    BUILD_WITH_INSTALL_RPATH 1
+    INSTALL_RPATH "@executable_path/../../../../Frameworks;@executable_path/../Frameworks;@executable_path/../Frameworks/plugins"
+    MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/slplugin_info.plist
+    XCODE_ATTRIBUTE_DEBUG_INFORMATION_FORMAT "dwarf-with-dsym"
+  )
+
   # Make sure the app bundle has a Resources directory (it will get populated by viewer-manifest.py later)
   add_custom_command(
     TARGET SLPlugin POST_BUILD
@@ -58,7 +59,7 @@ if (DARWIN)
       -p
       ${CMAKE_CURRENT_BINARY_DIR}/$<IF:$<BOOL:${LL_GENERATOR_IS_MULTI_CONFIG}>,$<CONFIG>,>/SLPlugin.app/Contents/Resources
   )
-endif (DARWIN)
+endif ()
 
 if (LL_TESTS)
   ll_deploy_sharedlibs_command(SLPlugin)