From 13fd771ab928e74c102aec99874f4f64fec563cd Mon Sep 17 00:00:00 2001
From: Michael Fabian 'Xaymar' Dirks <info@xaymar.com>
Date: Fri, 3 Nov 2017 10:48:06 +0100
Subject: [PATCH] cmake: Fix PACKAGE and INSTALL targets

INSTALL would incorrectly copy /data instead of the content of /data, resulting in the plugin not being able to load effects and default images.

PACKAGE was running from the wrong directory, resulting in an extra ".." directory being added, which was invisible for some decompression software.
---
 CMakeLists.txt | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cbe4410..7d2236a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -157,20 +157,18 @@ if(TARGET libobs)
 else()
 	INSTALL(TARGETS obs-stream-effects DESTINATION "${INSTALL_DIR}/obs-plugins/${BITS}bit")
 	INSTALL(FILES $<TARGET_PDB_FILE:obs-stream-effects> DESTINATION "${INSTALL_DIR}/obs-plugins/${BITS}bit" OPTIONAL)
-	INSTALL(DIRECTORY "${PROJECT_SOURCE_DIR}/data" DESTINATION "${INSTALL_DIR}/data/obs-plugins/obs-stream-effects" OPTIONAL)
+	INSTALL(DIRECTORY "${PROJECT_SOURCE_DIR}/data/" DESTINATION "${INSTALL_DIR}/data/obs-plugins/obs-stream-effects" OPTIONAL)
 	
 	# Zip Generator
 	ADD_CUSTOM_TARGET(PACKAGE_ZIP COMMAND
-		${CMAKE_COMMAND} -E tar "cfv" 
-		"${INSTALL_DIR}/obs-stream-effects.${VERSION_STR}.zip"
-		--format=zip
-		"${INSTALL_DIR}/data" "${INSTALL_DIR}/obs-plugins")
+		${CMAKE_COMMAND} -E tar "cfv" "${INSTALL_DIR}/obs-stream-effects.${VERSION_STR}.zip" --format=zip -- "${INSTALL_DIR}/data/" "${INSTALL_DIR}/obs-plugins"
+		DEPENDS INSTALL obs-stream-effects
+		WORKING_DIRECTORY "${INSTALL_DIR}")
 	
 	# 7-Zip Generator
 	ADD_CUSTOM_TARGET(PACKAGE_7ZIP COMMAND
-		${CMAKE_COMMAND} -E tar "cfv" 
-		"${INSTALL_DIR}/obs-stream-effects.${VERSION_STR}.7z"
-		--format=7zip
-		"${INSTALL_DIR}/data" "${INSTALL_DIR}/obs-plugins")
+		${CMAKE_COMMAND} -E tar "cfv" "${INSTALL_DIR}/obs-stream-effects.${VERSION_STR}.7z" --format=7zip -- "${INSTALL_DIR}/data/" "${INSTALL_DIR}/obs-plugins"
+		DEPENDS INSTALL obs-stream-effects
+		WORKING_DIRECTORY "${INSTALL_DIR}")
 	
 endif()