From kde-commits  Sun Feb 06 02:15:31 2011
From: Jeremy Paul Whiting <jpwhiting () kde ! org>
Date: Sun, 06 Feb 2011 02:15:31 +0000
To: kde-commits
Subject: KDE/kdeedu
Message-Id: <20110206021531.A4A83AC8CC () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=129695870001823

SVN commit 1219071 by whiting:

move rocs documentation from doc/rocs to rocs/doc

 M  +0 -4      doc/CMakeLists.txt  
 D             doc/rocs (directory)  
 M  +1 -0      rocs/CMakeLists.txt  
 A             rocs/doc (directory)  
 M  +1 -1      rocs/doc/CMakeLists.txt  


--- trunk/KDE/kdeedu/doc/CMakeLists.txt #1219070:1219071
@@ -2,7 +2,3 @@
   macro_optional_add_subdirectory(marble)
 endif()
 
-if(BUILD_rocs)
-  macro_optional_add_subdirectory(rocs)
-endif()
-
--- trunk/KDE/kdeedu/rocs/CMakeLists.txt #1219070:1219071
@@ -21,6 +21,7 @@
 find_package(Boost REQUIRED)
 include_directories(${Boost_INCLUDE_DIRS})
 
+add_subdirectory(doc)
 add_subdirectory(src)
 add_subdirectory(graphics)
 
--- trunk/KDE/kdeedu/rocs/doc/CMakeLists.txt #1219059:1219071
@@ -1 +1 @@
-kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en)
\ No newline at end of file
+kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR rocs)