From 5cb5c267caed96b23e1c6c7b8d3c04aaefe84c6a Mon Sep 17 00:00:00 2001
From: JJ Linden <jj@lindenlab.com>
Date: Mon, 13 Oct 2014 12:46:55 -0700
Subject: fixes for cmake warnings about policy changes. could not fully test
 these changes

---
 indra/test_apps/llplugintest/CMakeLists.txt | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'indra/test_apps/llplugintest')

diff --git a/indra/test_apps/llplugintest/CMakeLists.txt b/indra/test_apps/llplugintest/CMakeLists.txt
index 9d44563e26..0c8bdc464d 100755
--- a/indra/test_apps/llplugintest/CMakeLists.txt
+++ b/indra/test_apps/llplugintest/CMakeLists.txt
@@ -334,40 +334,40 @@ else (DARWIN)
   )
 endif (DARWIN)
 
-get_target_property(BUILT_SLPLUGIN SLPlugin LOCATION)
+set(BUILT_SLPLUGIN $<TARGET_FILE:SLPlugin>)
 add_custom_command(TARGET llmediaplugintest POST_BUILD
   COMMAND ${CMAKE_COMMAND} -E copy ${BUILT_SLPLUGIN}  ${PLUGINS_DESTINATION_DIR}
   DEPENDS ${BUILT_SLPLUGIN}
 )
 
-get_target_property(BUILT_LLCOMMON llcommon LOCATION)
+set(BUILT_LLCOMMON $<TARGET_FILE:llcommon>)
 add_custom_command(TARGET llmediaplugintest POST_BUILD
   COMMAND ${CMAKE_COMMAND} -E copy ${BUILT_LLCOMMON}  ${PLUGINS_DESTINATION_DIR}
   DEPENDS ${BUILT_LLCOMMON}
 )
 
-get_target_property(BUILT_WEBKIT_PLUGIN media_plugin_webkit LOCATION)
+set(BUILT_WEBKIT_PLUGIN $<TARGET_FILE:media_plugin_webkit>)
 add_custom_command(TARGET llmediaplugintest POST_BUILD
   COMMAND ${CMAKE_COMMAND} -E copy ${BUILT_WEBKIT_PLUGIN}  ${PLUGINS_DESTINATION_DIR}
   DEPENDS ${BUILT_WEBKIT_PLUGIN}
 )
 
 if (DARWIN OR WINDOWS)
-  get_target_property(BUILT_QUICKTIME_PLUGIN media_plugin_quicktime LOCATION)
+  set(BUILT_QUICKTIME_PLUGIN $<TARGET_FILE:media_plugin_quicktime>)
   add_custom_command(TARGET llmediaplugintest POST_BUILD
     COMMAND ${CMAKE_COMMAND} -E copy ${BUILT_QUICKTIME_PLUGIN}  ${PLUGINS_DESTINATION_DIR}
     DEPENDS ${BUILT_QUICKTIME_PLUGIN}
   )
 endif (DARWIN OR WINDOWS)
 
-get_target_property(BUILT_EXAMPLE_PLUGIN media_plugin_example LOCATION)
+set(BUILT_EXAMPLE_PLUGIN $<TARGET_FILE:media_plugin_example>)
 add_custom_command(TARGET llmediaplugintest POST_BUILD
   COMMAND ${CMAKE_COMMAND} -E copy ${BUILT_EXAMPLE_PLUGIN}  ${PLUGINS_DESTINATION_DIR}
   DEPENDS ${BUILT_EXAMPLE_PLUGIN}
 )
 
 # copy over bookmarks file if llmediaplugintest gets built
-get_target_property(BUILT_LLMEDIAPLUGINTEST llmediaplugintest LOCATION)
+set(BUILT_LLMEDIAPLUGINTEST $<TARGET_FILE:llmediaplugintest>)
 add_custom_command(TARGET llmediaplugintest POST_BUILD
   COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/bookmarks.txt ${CMAKE_CURRENT_BINARY_DIR}/
   DEPENDS ${BUILT_LLMEDIAPLUGINTEST}
-- 
cgit v1.2.3