From d3ece746f2f4bbd6164ca15cd7923896afc4dac8 Mon Sep 17 00:00:00 2001
From: jp9000 <obs.jim@gmail.com>
Date: Thu, 23 Jun 2016 20:00:39 -0700
Subject: [PATCH] cmake/external: Fix a few external plugin script bugs

For install_external_plugin_bin_to_data and
install_external_plugin_bin_to_arch_data, they were using the
'plugin_target' variable instead of just 'target' for the plugin
directory output location, and they were using 'target' instead of
'additional_target' for the data/binaries they were supposed to be
installing.
---
 cmake/external/ObsPluginHelpers.cmake | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/cmake/external/ObsPluginHelpers.cmake b/cmake/external/ObsPluginHelpers.cmake
index abc318585..f40d07d6e 100644
--- a/cmake/external/ObsPluginHelpers.cmake
+++ b/cmake/external/ObsPluginHelpers.cmake
@@ -106,13 +106,13 @@ endfunction()
 # 'target' is the destination target project being installed to
 # 'additional_target' specifies the additional binary
 function(install_external_plugin_bin_to_data target additional_target)
-	install(TARGETS ${target}
+	install(TARGETS ${additional_target}
 		LIBRARY DESTINATION "data"
 		RUNTIME DESTINATION "data")
-	add_custom_command(TARGET ${target} POST_BUILD
+	add_custom_command(TARGET ${additional_target} POST_BUILD
 		COMMAND "${CMAKE_COMMAND}" -E copy
-			"$<TARGET_FILE:${target}>"
-			"${EXTERNAL_PLUGIN_OUTPUT_DIR}/$<CONFIGURATION>/${plugin_target}/data/$<TARGET_FILE_NAME:${target}>"
+			"$<TARGET_FILE:${additional_target}>"
+			"${EXTERNAL_PLUGIN_OUTPUT_DIR}/$<CONFIGURATION>/${target}/data/$<TARGET_FILE_NAME:${additional_target}>"
 		VERBATIM)
 endfunction()
 
@@ -128,12 +128,12 @@ function(install_external_plugin_bin_to_arch_data target additional_target)
 		set(_bit_suffix "/32bit")
 	endif()
 
-	install(TARGETS ${target}
+	install(TARGETS ${additional_target}
 		LIBRARY DESTINATION "data${_bit_suffix}"
 		RUNTIME DESTINATION "data${_bit_suffix}")
-	add_custom_command(TARGET ${target} POST_BUILD
+	add_custom_command(TARGET ${additional_target} POST_BUILD
 		COMMAND "${CMAKE_COMMAND}" -E copy
-			"$<TARGET_FILE:${target}>"
-			"${EXTERNAL_PLUGIN_OUTPUT_DIR}/$<CONFIGURATION>/${plugin_target}/data${_bit_suffix}/$<TARGET_FILE_NAME:${target}>"
+			"$<TARGET_FILE:${additional_target}>"
+			"${EXTERNAL_PLUGIN_OUTPUT_DIR}/$<CONFIGURATION>/${target}/data${_bit_suffix}/$<TARGET_FILE_NAME:${additional_target}>"
 		VERBATIM)
 endfunction()