From 774584d7e84843503a5ef4477748cecfdaedeb3d Mon Sep 17 00:00:00 2001
From: Brecht Van Lommel <brechtvanlommel@pandora.be>
Date: Thu, 28 Apr 2011 13:47:27 +0000
Subject: Cycles: hook up the CMake build system.

New build instructions for Ubuntu Linux in the wiki:
http://wiki.blender.org/index.php/Dev:2.5/Source/Cycles
---
 intern/cycles/doc/CMakeLists.txt | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'intern/cycles/doc/CMakeLists.txt')

diff --git a/intern/cycles/doc/CMakeLists.txt b/intern/cycles/doc/CMakeLists.txt
index 116ca5e5b9f..d6e487663c3 100644
--- a/intern/cycles/doc/CMakeLists.txt
+++ b/intern/cycles/doc/CMakeLists.txt
@@ -1,5 +1,5 @@
 
-INSTALL(DIRECTORY license DESTINATION ${INSTALL_PATH}/cycles)
+INSTALL(DIRECTORY license DESTINATION ${CYCLES_INSTALL_PATH}/cycles PATTERN ".svn" EXCLUDE)
 
 SET(doc_sources
 	index.html
@@ -76,12 +76,12 @@ SET(doc_templates
 	templates/nodes.html
 	templates/reference.html)
 
-IF(WITH_DOCS)
+IF(WITH_CYCLES_DOCS)
 	MACRO(install_doc_file source_file html_file)
 		GET_FILENAME_COMPONENT(subdir ${source_file} PATH)
 		INSTALL(
 			FILES ${html_file}
-			DESTINATION ${INSTALL_PATH}/cycles/doc/${subdir})
+			DESTINATION ${CYCLES_INSTALL_PATH}/cycles/doc/${subdir})
 	ENDMACRO()
 
 	FOREACH(_file ${doc_sources})
@@ -100,6 +100,6 @@ IF(WITH_DOCS)
 		install_doc_file(${_file} ${_file})
 	ENDFOREACH()
 
-	ADD_CUSTOM_TARGET(doc ALL DEPENDS ${html_files})
+	ADD_CUSTOM_TARGET(cycles_doc ALL DEPENDS ${html_files})
 ENDIF()
 
-- 
cgit v1.2.3