Merge pull request #7 from MattMcNam/master

Updated CMake with new effect file locations

Merge pull request #7 from MattMcNam/master
Updated CMake with new effect file locations
6887f003 · Jim · 4c256cc0 · a76a5937 · 6887f003 · 6887f003
隐藏空白更改
内联并排

Showing with 14 addition and 5 deletion

.gitignore .gitignore +9 -0

libobs/CMakeLists.txt libobs/CMakeLists.txt +2 -2

test/test-input/CMakeLists.txt test/test-input/CMakeLists.txt +3 -3

未找到文件。
--- a/.gitignore
+++ b/.gitignore
@@ -69,3 +69,12 @@ tags
 *.ninja
 .ninja*
 .dirstamp
+
+#cmake
+cmake_install.cmake
+CMakeCache.txt
+CMakeFiles/
+CMakeScripts/
+
+#xcode
+*.xcodeproj/
--- a/libobs/CMakeLists.txt
+++ b/libobs/CMakeLists.txt
@@ -76,5 +76,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/)
--- 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/)