Changeset 5695 for code/trunk/doc

Timestamp:

Aug 30, 2009, 2:22:00 AM (15 years ago)

Author:

rgrieder

Message:

Merged resource2 branch back to trunk.

IMPORTANT NOTE:
Upon this merge you need to specifically call your data directory "data_extern" when checking it out (when you don't provide a name, it will be just called 'trunk').
The new CMake variable is EXTERNAL_DATA_DIRECTORY. DATA_DIRECTORY now points to the one the source part of the repository.
UPDATE YOUR DATA DIRECTORY AS WELL!!!

Location:

code/trunk

Files:

• . (modified) (1 prop)
• doc/api/CMakeLists.txt (modified) (2 diffs)

code/trunk/doc/api/CMakeLists.txt

@@ -76 +76 @@
   INSTALL(
     FILES ${DOXY_CONFIG} ${CMAKE_CURRENT_BINARY_DIR}/doxy.log
-    DESTINATION ${ORXONOX_DOC_INSTALL_PATH}/api
-    OPTIONAL
+    DESTINATION ${DOC_INSTALL_DIRECTORY}/api OPTIONAL
   )
   # Install command always needs the directory
@@ -85 +84 @@
   INSTALL(
     DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html
-    DESTINATION ${ORXONOX_DOC_INSTALL_PATH}/api
+    DESTINATION ${DOC_INSTALL_DIRECTORY}/api
   )
 ENDIF(DOXYGEN_FOUND)