Changeset 2574

Timestamp:

Jan 6, 2009, 9:37:52 PM (16 years ago)

Author:

rgrieder

Message:

Changed CEGUILua directory choosing and restricted root directory builds.

Location:

code/branches/buildsystem2

Files:

• CMakeLists.txt (modified) (2 diffs)
• cmake/FindCEGUI.cmake (modified) (1 diff)
• src/CMakeLists.txt (modified) (4 diffs)

code/branches/buildsystem2/CMakeLists.txt

@@ -2 +2 @@
 
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6 FATAL_ERROR)
+
+# Also forbid to use the root directory as binary directory
+IF(${CMAKE_CURRENT_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_BINARY_DIR})
+  MESSAGE(FATAL_ERROR "Do not use the root directory as CMake output directory! Mkdir a new subdir and invoke cmake ..")
+ENDIF(${CMAKE_CURRENT_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_BINARY_DIR})
 
 # This sets where to look for modules (e.g. "Find*.cmake" files)
@@ -54 +59 @@
 FIND_PACKAGE(OGRE REQUIRED)
 FIND_PACKAGE(CEGUI REQUIRED)
-# CEGUI_OGRE is already included in source
-#FIND_PACKAGE(CEGUI_OGRE REQUIRED)
 FIND_PACKAGE(ENet REQUIRED)
 FIND_PACKAGE(Boost 1.34 REQUIRED thread filesystem)

code/branches/buildsystem2/cmake/FindCEGUI.cmake

@@ -63 +63 @@
 DetermineVersion(CEGUI ${CEGUI_INCLUDE_DIR}/CEGUIVersion.h _CEGUI_VERSION_temp)
 SET(CEGUI_VERSION "${_CEGUI_VERSION_temp}" CACHE STRING "")
-# LESS can be dangerous since it only compares strings.
+# STRLESS can be dangerous since it only compares strings.
 # Howerver VERSION_LESS seems to be having serious issues.
-IF(${CEGUI_VERSION} LESS "0.5.0")
+IF(${CEGUI_VERSION} STRLESS "0.5.0")
   MESSAGE(FATAL_ERROR "Minimum CEGUI version required is 0.5.0")
-ENDIF(${CEGUI_VERSION} LESS "0.5.0")
+ENDIF(${CEGUI_VERSION} STRLESS "0.5.0")
 
 

code/branches/buildsystem2/src/CMakeLists.txt

@@ -3 +3 @@
   ${OGRE_INCLUDE_DIR}
   ${CEGUI_INCLUDE_DIR}
-#  ${CEGUI_OGRE_INCLUDE_DIR}
   ${ENet_INCLUDE_DIR}
   ${Boost_INCLUDE_DIRS}
@@ -16 +15 @@
 )
 
+# Check whether the required CEGUILua version is even available
+IF(NOT IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/ceguilua-${CEGUI_VERSION})
+  MESSAGE(FATAL_ERROR "Your CEGUI version is not supported (${CEGUI_VERSION})")
+ENDIF(NOT IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/ceguilua-${CEGUI_VERSION})
+
 INCLUDE_DIRECTORIES(
+  ceguilua-${CEGUI_VERSION}/ceguilua
   cpptcl
   ois
@@ -34 +39 @@
 SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DTIXML_USE_TICPP")
 
+ADD_SUBDIRECTORY(ceguilua-${CEGUI_VERSION}/ceguilua)
 ADD_SUBDIRECTORY(cpptcl)
 ADD_SUBDIRECTORY(ogreceguirenderer)
@@ -39 +45 @@
 ADD_SUBDIRECTORY(tinyxml)
 ADD_SUBDIRECTORY(tolua)
-
-# TODO: FIXME
-# Some people may not have CEGUILua installed, espc. with version 0.5
-# And we don't know what lua version it was linked against, so we compile
-# it ourselves.
-# So first, find out what CEGUI version we have.
-
-IF (WIN32)
-    ADD_SUBDIRECTORY(ceguilua-0.6.1/ceguilua)
-    INCLUDE_DIRECTORIES(ceguilua-0.6.1/ceguilua)
-ELSE (WIN32)
-    # FIXME
-    #IF (${CEGUI_VERSION} LESS 0.6.0)
-        ADD_SUBDIRECTORY(ceguilua-0.5.0/ceguilua)
-        INCLUDE_DIRECTORIES(ceguilua-0.5.0/ceguilua)
-    #ELSE (${CEGUI_VERSION} LESS 0.6.0)
-    #    ADD_SUBDIRECTORY(ceguilua-0.6.1/ceguilua)
-    #    INCLUDE_DIRECTORIES(ceguilua-0.6.1/ceguilua)
-    #ENDIF (${CEGUI_VERSION} LESS 0.6.0)
-ENDIF (WIN32)
 
 # Include macros