From a76a5937df61c46049c388feed7d13f71e7c34e5 Mon Sep 17 00:00:00 2001
From: Matthew McNamara <matt@mattmcn.com>
Date: Sat, 7 Dec 2013 20:12:45 +0100
Subject: [PATCH] Updated CMakeLists with new effect file locations, added
 cmake & xcode build folders to gitignore

---
 .gitignore                     | 9 +++++++++
 libobs/CMakeLists.txt          | 4 ++--
 test/test-input/CMakeLists.txt | 6 +++---
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index b87144788..b4e4ffa91 100644
--- a/.gitignore
+++ b/.gitignore
@@ -69,3 +69,12 @@ tags
 *.ninja
 .ninja*
 .dirstamp
+
+#cmake
+cmake_install.cmake
+CMakeCache.txt
+CMakeFiles/
+CMakeScripts/
+
+#xcode
+*.xcodeproj/
diff --git a/libobs/CMakeLists.txt b/libobs/CMakeLists.txt
index 9128e58aa..017b4fac4 100644
--- a/libobs/CMakeLists.txt
+++ b/libobs/CMakeLists.txt
@@ -72,5 +72,5 @@ target_link_libraries(libobs
 	${LIBAVUTIL_LIBRARIES}
 	${LIBSWRESAMPLE_LIBRARIES})
 
-file(COPY ${obs_SOURCE_DIR}/build/libobs/default.effect DESTINATION
-	${obs_BINARY_DIR}/libobs/)
+file(COPY ${obs_SOURCE_DIR}/build/data/libobs/default.effect DESTINATION
+	${obs_BINARY_DIR}/data/libobs/)
diff --git a/test/test-input/CMakeLists.txt b/test/test-input/CMakeLists.txt
index 949155b02..6bcfd3336 100644
--- a/test/test-input/CMakeLists.txt
+++ b/test/test-input/CMakeLists.txt
@@ -9,6 +9,6 @@ target_link_libraries(test-input
 	libobs)
 
 file(COPY
-	${obs_SOURCE_DIR}/build/data/test-input/draw.effect
-	${obs_SOURCE_DIR}/build/data/test-input/test.effect
-	DESTINATION ${obs_BINARY_DIR}/data/test-input/)
+	${obs_SOURCE_DIR}/build/data/obs-plugins/test-input/draw.effect
+	${obs_SOURCE_DIR}/build/data/obs-plugins/test-input/test.effect
+	DESTINATION ${obs_BINARY_DIR}/data/obs-plugins/test-input/)