Changeset 5695 for code/trunk/cmake/LibraryConfig.cmake

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)
• cmake/LibraryConfig.cmake (modified) (4 diffs)

code/trunk/cmake/LibraryConfig.cmake

@@ -31 +31 @@
 # Prevent CMake from finding libraries in the installation folder on Windows.
 # There might already be an installation from another compiler
-IF(DEPENDENCY_PACKAGE_ENABLE)
+IF(WIN32)
   LIST(REMOVE_ITEM CMAKE_SYSTEM_PREFIX_PATH  "${CMAKE_INSTALL_PREFIX}")
   LIST(REMOVE_ITEM CMAKE_SYSTEM_LIBRARY_PATH "${CMAKE_INSTALL_PREFIX}/bin")
@@ -72 +72 @@
 
 # User script
-SET(USER_SCRIPT_LIBRARY_CONFIG "" CACHE FILEPATH
+SET(LIBRARY_CONFIG_USER_SCRIPT "" CACHE FILEPATH
     "Specify a CMake script if you wish to write your own library path config.
-     See LibraryConfigTardis.cmake or LibraryConfigMinGW.cmake for examples.")
-IF(USER_SCRIPT_LIBRARY_CONFIG)
-  IF(EXISTS ${CMAKE_MODULE_PATH}/${USER_SCRIPT_LIBRARY_CONFIG}.cmake)
-    INCLUDE(${USER_SCRIPT_LIBRARY_CONFIG})
-  ELSEIF(EXISTS ${USER_SCRIPT_LIBRARY_CONFIG})
-    INCLUDE(${USER_SCRIPT_LIBRARY_CONFIG})
-  ELSEIF(EXISTS ${CMAKE_MODULE_PATH}/${USER_SCRIPT_LIBRARY_CONFIG})
-    INCLUDE(${CMAKE_MODULE_PATH}/${USER_SCRIPT_LIBRARY_CONFIG})
-  ENDIF()
-ENDIF(USER_SCRIPT_LIBRARY_CONFIG)
+     See LibraryConfigTardis.cmake for an example.")
+IF(LIBRARY_CONFIG_USER_SCRIPT)
+  IF(EXISTS ${CMAKE_MODULE_PATH}/${LIBRARY_CONFIG_USER_SCRIPT})
+    INCLUDE(${CMAKE_MODULE_PATH}/${LIBRARY_CONFIG_USER_SCRIPT})
+  ENDIF()
+ENDIF(LIBRARY_CONFIG_USER_SCRIPT)
 
 
@@ -89 +85 @@
 # Performs the search and sets the variables    #
 
-FIND_PACKAGE(OGRE  1.4 EXACT REQUIRED)
+FIND_PACKAGE(OGRE  1.4       REQUIRED)
 FIND_PACKAGE(ENet  1.1       REQUIRED)
 FIND_PACKAGE(Ogg             REQUIRED)
@@ -185 +181 @@
   ENDIF()
 ENDIF(WIN32)
+
+
+################# OGRE Plugins ##################
+
+# More plugins: Plugin_BSPSceneManager, Plugin_OctreeSceneManager
+SET(OGRE_PLUGINS_INT Plugin_ParticleFX)
+IF(WIN32)
+  # CG program manager is probably DirectX related (not available under unix)
+  LIST(APPEND OGRE_PLUGINS_INT Plugin_CgProgramManager)
+ENDIF(WIN32)
+SET(OGRE_PLUGINS ${OGRE_PLUGINS_INT} CACHE STRING
+   "Specify which OGRE plugins to load. Existance check is performed.")
+
+# Check the plugins and determine the plugin folder
+# You can give a hint by setting the environment variable ENV{OGRE_PLUGIN_DIR}
+INCLUDE(CheckOGREPlugins)
+CHECK_OGRE_PLUGINS(${OGRE_PLUGINS})
+