Changeset 790 for code/trunk/cmake

Timestamp:

Feb 7, 2008, 5:01:44 PM (16 years ago)

Author:

nicolasc

Message:

merged FICN back into trunk
awaiting release.

Location:

code/trunk

Files:

• . (modified) (1 prop)
• cmake/FindALUT.cmake (copied) (copied from code/branches/FICN/cmake/FindALUT.cmake)
• cmake/FindBoost.cmake (copied) (copied from code/branches/FICN/cmake/FindBoost.cmake)
• cmake/FindCEGUI.cmake (modified) (1 diff)
• cmake/FindCEGUI_OGRE.cmake (modified) (1 diff)
• cmake/FindENet.cmake (copied) (copied from code/branches/FICN/cmake/FindENet.cmake)
• cmake/FindODE.cmake (copied) (copied from code/branches/FICN/cmake/FindODE.cmake)
• cmake/FindOGRE.cmake (modified) (1 diff)
• cmake/FindOIS.cmake (modified) (1 diff)
• cmake/FindOggVorbis.cmake (copied) (copied from code/branches/FICN/cmake/FindOggVorbis.cmake)
• cmake/FindOpenAL.cmake (copied) (copied from code/branches/FICN/cmake/FindOpenAL.cmake)
• cmake/FindZLIB.cmake (copied) (copied from code/branches/FICN/cmake/FindZLIB.cmake)

code/trunk/cmake/FindCEGUI.cmake

@@ -22 +22 @@
 IF (WIN32) #Windows
     MESSAGE(STATUS "Looking for CEGUI")
-    SET(CEGUI_INCLUDE_DIR ../ogre/Dependencies/include/CEGUI)
-    SET(CEGUI_LIB_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../ogre/Samples/Common/bin/Release/lib)
+    SET(CEGUI_INCLUDE_DIR ../libs/ogre/Dependencies/include/CEGUI)
+    SET(CEGUI_LIB_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../libs/ogre/Samples/Common/bin/Release/lib)
     SET(CEGUI_LIBRARIES debug CEGUIBase_d optimized CEGUIBase)
 ELSE (WIN32) #Unix

code/trunk/cmake/FindCEGUI_OGRE.cmake

@@ -22 +22 @@
 IF (WIN32) #Windows
     MESSAGE(STATUS "Looking for CEGUI_OGRE")
-    SET(CEGUI_OGRE_INCLUDE_DIR ../ogre/Samples/Common/CEGUIRenderer/include)
-    SET(CEGUI_OGRE_LIB_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../ogre/Samples/Common/bin/Release/lib)
+    SET(CEGUI_OGRE_INCLUDE_DIR ../libs/ogre/Samples/Common/CEGUIRenderer/include)
+    SET(CEGUI_OGRE_LIB_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../libs/ogre/Samples/Common/bin/Release/lib)
     SET(CEGUI_OGRE_LIBRARIES debug OgreGUIRenderer_d optimized OgreGUIRenderer)
 ELSE (WIN32) #Unix

code/trunk/cmake/FindOGRE.cmake

@@ -18 +18 @@
 IF (WIN32) #Windows
     MESSAGE(STATUS "Looking for OGRE")
-    SET(OGRE_INCLUDE_DIR ../ogre/OgreMain/include)
-    SET(OGRE_LIB_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../ogre/Samples/Common/bin/Release)
+    SET(OGRE_INCLUDE_DIR ../libs/ogre/OgreMain/include)
+    SET(OGRE_LIB_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../libs/ogre/Samples/Common/bin/Release)
     SET(OGRE_LIBRARIES debug OgreMain_d optimized OgreMain)
 ELSE (WIN32) #Unix

code/trunk/cmake/FindOIS.cmake

@@ -22 +22 @@
 IF (WIN32) #Windows
     MESSAGE(STATUS "Looking for OIS")
-    SET(OIS_INCLUDE_DIR ../ogre/Dependencies/include)
-    SET(OIS_LIB_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../ogre/Samples/Common/bin/Release)
+    SET(OIS_INCLUDE_DIR ../libs/ogre/Dependencies/include)
+    SET(OIS_LIB_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../libs/ogre/Samples/Common/bin/Release)
     SET(OIS_LIBRARIES debug OIS_d optimized OIS)
 ELSE (WIN32) #Unix