Changeset 5645 for code/branches/resource2/cmake

Timestamp:

Aug 13, 2009, 10:50:07 PM (15 years ago)

Author:

rgrieder

Message:

Renamed media to data to restore consistency with game/data/trunk folder name.
Couldn't yet rename the media folder though probably due to some fundamental limitations of SVN (believe me, I tried).

Location:

code/branches/resource2

Files:

• . (modified) (1 prop)
• cmake/BuildConfig.cmake (modified) (5 diffs)

code/branches/resource2

@@ -1 @@
-media_stripped http://svn.orxonox.net/game/data/branches/media_stripped
+data_stripped https://svn.orxonox.net/game/data/branches/media_stripped

@@ -1 @@
-media_stripped http://svn.orxonox.net/game/data/branches/media_stripped
+data_stripped https://svn.orxonox.net/game/data/branches/media_stripped

code/branches/resource2/cmake/BuildConfig.cmake

@@ -22 +22 @@
  #  Description:
  #    Configures the compilers and sets build options.
- #    This also includes handling the OGRE plugins and the media directory.
+ #    This also includes handling the OGRE plugins and the data directory.
  #
 
@@ -32 +32 @@
 SET(DEFAULT_ARCHIVE_PATH lib/static)
 SET(DEFAULT_DOC_PATH     doc)
-SET(DEFAULT_MEDIA_PATH   media)
+SET(DEFAULT_DATA_PATH    data)
 SET(DEFAULT_CONFIG_PATH  config)
 SET(DEFAULT_LOG_PATH     log)
@@ -41 +41 @@
 SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${DEFAULT_ARCHIVE_PATH})
 SET(CMAKE_DOC_OUTPUT_DIRECTORY     ${CMAKE_BINARY_DIR}/${DEFAULT_DOC_PATH})
-# Media directories are only inputs
+# Data directories are only inputs
 SET(CMAKE_CONFIG_OUTPUT_DIRECTORY  ${CMAKE_BINARY_DIR}/${DEFAULT_CONFIG_PATH})
 SET(CMAKE_LOG_OUTPUT_DIRECTORY     ${CMAKE_BINARY_DIR}/${DEFAULT_LOG_PATH})
@@ -131 +131 @@
 SET(ARCHIVE_INSTALL_DIRECTORY ${CMAKE_INSTALL_PREFIX}/${DEFAULT_ARCHIVE_PATH})
 SET(DOC_INSTALL_DIRECTORY     ${CMAKE_INSTALL_PREFIX}/${DEFAULT_DOC_PATH})
-SET(MEDIA_INSTALL_DIRECTORY   ${CMAKE_INSTALL_PREFIX}/${DEFAULT_MEDIA_PATH})
+SET(DATA_INSTALL_DIRECTORY    ${CMAKE_INSTALL_PREFIX}/${DEFAULT_DATA_PATH})
 SET(CONFIG_INSTALL_DIRECTORY  ${CMAKE_INSTALL_PREFIX}/${DEFAULT_CONFIG_PATH})
 SET(LOG_INSTALL_DIRECTORY     ${CMAKE_INSTALL_PREFIX}/${DEFAULT_LOG_PATH})
@@ -142 +142 @@
     SET(ARCHIVE_INSTALL_DIRECTORY ${CMAKE_INSTALL_PREFIX}/lib/orxonox/static)
     SET(DOC_INSTALL_DIRECTORY     ${CMAKE_INSTALL_PREFIX}/share/doc/orxonox)
-    SET(MEDIA_INSTALL_DIRECTORY   ${CMAKE_INSTALL_PREFIX}/share/orxonox)
+    SET(DATA_INSTALL_DIRECTORY    ${CMAKE_INSTALL_PREFIX}/share/orxonox)
   ENDIF()
 

@@ -1 @@
-media_stripped http://svn.orxonox.net/game/data/branches/media_stripped
+data_stripped https://svn.orxonox.net/game/data/branches/media_stripped