Changeset 2612 for code/branches/buildsystem2/cmake/CheckOGREPlugins.cmake

Timestamp:

Jan 29, 2009, 10:04:38 PM (15 years ago)

Author:

rgrieder

Message:

Rearranged CMake configuration code. I split serveral files in two and moved some code around.
There are no actual code changes!

Details:

• Everything that involves library finding is in LibraryConfig.cmake. It includes other LibraryConfigXXX.cmake files that set specific options for certain platforms or package configurations (like MSVC or MinGW dependency package).
• All build related code is in BuildConfig.cmake. The actual compiler configuration is done in BuildConfigXXX.cmake where XXX can be GCC or MSVC.
• The changes above implied splitting FindOGRE.cmake in two (was going to do it anyway, but rather in a later commit) so that CheckOGREPlugins.cmake is now a separate module.

File:

• code/branches/buildsystem2/cmake/CheckOGREPlugins.cmake (copied) (copied from code/branches/buildsystem2/cmake/FindOGRE.cmake) (2 diffs)

code/branches/buildsystem2/cmake/CheckOGREPlugins.cmake

@@ -1 @@
-# Find OGRE includes and library
-#
-# This module defines
-#  OGRE_INCLUDE_DIR
-#  OGRE_LIBRARY, the library to link against to use OGRE.
-#  OGRE_FOUND, If false, do not try to use OGRE
-#
-# Copyright © 2007, Matt Williams
-# Modified by Nicolas Schlumberger to make it work on the Tardis-Infrastucture of the ETH Zurich
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-#
-# Several changes and additions by Fabian 'x3n' Landau
-# Lots of simplifications by Adrian Friedli
-# Plugin checking by Reto Grieder
-#                 > www.orxonox.net <
-
-INCLUDE(FindPackageHandleStandardArgs)
-INCLUDE(HandleLibraryTypes)
-
-FIND_PATH(OGRE_INCLUDE_DIR Ogre.h
-    PATHS $ENV{OGRE_HOME} /usr/local /usr
-    PATH_SUFFIXES include include/OGRE
-)
-FIND_LIBRARY(OGRE_LIBRARY_OPTIMIZED
-    NAMES OgreMain
-    PATHS $ENV{OGRE_HOME} /usr/local /usr
-    PATH_SUFFIXES lib bin/Release bin/release Release release
-)
-FIND_LIBRARY(OGRE_LIBRARY_DEBUG
-    NAMES OgreMain${LIBRARY_DEBUG_POSTFIX}
-    PATHS $ENV{OGRE_HOME} /usr/local /usr
-    PATH_SUFFIXES lib bin/Debug bin/debug Debug debug
-)
-
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(OGRE DEFAULT_MSG
-    OGRE_LIBRARY_OPTIMIZED
-    OGRE_INCLUDE_DIR
-)
-
-# Set optimized and debug libraries
-HandleLibraryTypes(OGRE)
-
-###############################################
-# Also make sure we have the required plugins #
-###############################################
-
 IF(WIN32)
     # On Windows we need only *.dll, not *.lib. Especially the MSVC generator doesn't look for *.dll
@@ -116 +69 @@
 STRING(REPLACE ";" ", " OGRE_PLUGINS_RELEASE "${OGRE_PLUGINS_RELEASE}")
 STRING(REPLACE ";" ", " OGRE_PLUGINS_DEBUG   "${OGRE_PLUGINS_DEBUG}")
-
-
-MARK_AS_ADVANCED(
-    OGRE_LIBRARY
-    OGRE_LIBRARY_OPTIMIZED
-    OGRE_LIBRARY_DEBUG
-    OGRE_INCLUDE_DIR
-)