summaryrefslogtreecommitdiff
path: root/indra/test_apps/llfbconnecttest/CMakeLists.txt
diff options
context:
space:
mode:
authorJJ Linden <jj@lindenlab.com>2014-10-13 12:46:55 -0700
committerJJ Linden <jj@lindenlab.com>2014-10-13 12:46:55 -0700
commit5cb5c267caed96b23e1c6c7b8d3c04aaefe84c6a (patch)
treee238dd104c9a478c7b753713ce1cfc30f835340d /indra/test_apps/llfbconnecttest/CMakeLists.txt
parent4fb1bae807a5dd8a342946b8f23d2a7a5aa5d36a (diff)
fixes for cmake warnings about policy changes. could not fully test these changes
Diffstat (limited to 'indra/test_apps/llfbconnecttest/CMakeLists.txt')
-rw-r--r--indra/test_apps/llfbconnecttest/CMakeLists.txt8
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/test_apps/llfbconnecttest/CMakeLists.txt b/indra/test_apps/llfbconnecttest/CMakeLists.txt
index 512bf202ae..25aaebb783 100644
--- a/indra/test_apps/llfbconnecttest/CMakeLists.txt
+++ b/indra/test_apps/llfbconnecttest/CMakeLists.txt
@@ -109,27 +109,27 @@ else (DARWIN)
)
endif (DARWIN)
-get_target_property(BUILT_SLPLUGIN SLPlugin LOCATION)
+set(BUILT_SLPLUGIN $<TARGET_FILE:SLPlugin>)
add_custom_command(TARGET llfbconnecttest 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 llfbconnecttest 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 llfbconnecttest POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy ${BUILT_WEBKIT_PLUGIN} ${PLUGINS_DESTINATION_DIR}
DEPENDS ${BUILT_WEBKIT_PLUGIN}
)
# copy over bookmarks file if llfbconnecttest gets built
-get_target_property(BUILT_LLFBCONNECTTEST llfbconnecttest LOCATION)
+set(BUILT_LLFBCONNECTTEST $<TARGET_FILE:llfbconnecttest>)
add_custom_command(TARGET llfbconnecttest POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/bookmarks.txt ${CMAKE_CURRENT_BINARY_DIR}/
DEPENDS ${BUILT_LLFBCONNECTTEST}