Mercurial > sumwars

changeset 2666:c5411da08688 gussoundtest

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
refs #29: Cmake should find CEGUI on Linux more reliable now
author Stefan Stammberger <fusion44>
date Mon, 03 Mar 2014 17:46:01 +0100
parents f668404a819b
children 2a5dbf14164b 3f00c28d6d20
files CMakeModules/FindCEGUI.cmake CMakeModules/FindCEGUIOGRE.cmake
diffstat 2 files changed, 5 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/CMakeModules/FindCEGUI.cmake	Sun Feb 16 21:18:42 2014 +0100
+++ b/CMakeModules/FindCEGUI.cmake	Mon Mar 03 17:46:01 2014 +0100
@@ -33,9 +33,9 @@
 INCLUDE(HandleLibraryTypes)
 
 FIND_PATH(CEGUI_INCLUDE_DIR
-  NAMES cegui/CEGUI.h
-  PATHS $ENV{CEGUIDIR}
-  PATH_SUFFIXES /include /cegui/include /cegui/include/cegui /include/CEGUI CEGUI.framework/Headers
+  NAMES CEGUI/CEGUI.h
+  PATHS $ENV{CEGUIDIR} /usr /usr/local 
+  PATH_SUFFIXES cegui-0 cegui-99 /include /cegui/include /cegui/include/cegui /include/CEGUI CEGUI.framework/Headers 
 )
 
 MESSAGE (STATUS "*** CEGUI_INCLUDE_DIR is: ${CEGUI_INCLUDE_DIR}")
--- a/CMakeModules/FindCEGUIOGRE.cmake	Sun Feb 16 21:18:42 2014 +0100
+++ b/CMakeModules/FindCEGUIOGRE.cmake	Mon Mar 03 17:46:01 2014 +0100
@@ -29,8 +29,9 @@
 
 FIND_PATH(CEGUIOGRE_INCLUDE_DIRS
   NAMES CEGUIOgreRenderer.h Renderer.h
-  PATHS $ENV{CEGUIDIR}
+  PATHS $ENV{CEGUIDIR} /usr /usr/local 
   PATH_SUFFIXES include/RendererModules/Ogre 
+    cegui-0/CEGUI/RendererModules/Ogre 
     cegui/include/RendererModules/Ogre 
     include/CEGUI/RendererModules/Ogre 
     CEGUI.framework/Headers