Changeset 1810 for code/trunk/cmake

Timestamp:

Sep 21, 2008, 8:44:25 PM (16 years ago)

Author:

rgrieder

Message:

merged ceguilua branch back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• cmake/FindCEGUI.cmake (modified) (6 diffs)

code/trunk/cmake/FindCEGUI.cmake

@@ -19 +19 @@
 #                 > www.orxonox.net <
 
-IF (CEGUI_LIBRARIES AND CEGUI_INCLUDE_DIR AND CEGUI_LIB_DIR AND CEGUI_SCRIPT_LIBRARIES)
+IF (CEGUI_LIBRARIES AND CEGUI_INCLUDE_DIR AND CEGUI_LIB_DIR)# AND CEGUI_SCRIPT_LIBRARIES)
     SET(CEGUI_FIND_QUIETLY TRUE) # Already in cache, be silent
-ENDIF (CEGUI_LIBRARIES AND CEGUI_INCLUDE_DIR AND CEGUI_LIB_DIR AND CEGUI_SCRIPT_LIBRARIES)
+ENDIF (CEGUI_LIBRARIES AND CEGUI_INCLUDE_DIR AND CEGUI_LIB_DIR)# AND CEGUI_SCRIPT_LIBRARIES)
 
 IF (WIN32) #Windows
@@ -39 +39 @@
     ENDIF (CEGUI_LIBDIR)
 
-    IF (NOT CEGUI_SCRIPT_LIBDIR)
-        # Search Lua script module
-        SET(CEGUI_SCRIPT_LIBRARIES "CEGUILuaScriptModule")
-        FIND_LIBRARY(CEGUI_SCRIPT_LIBDIR NAMES ${CEGUI_SCRIPT_LIBRARIES} PATHS
-            ../libs/cegui-0.6.1/bin
-        )
-        IF (NOT CEGUI_SCRIPT_LIBDIR)
-            SET(CEGUI_SCRIPT_LIBRARIES "CEGUILua")
-            FIND_LIBRARY(CEGUI_SCRIPT_LIBDIR NAMES ${CEGUI_SCRIPT_LIBRARIES} PATHS
-                ../libs/cegui-0.6.1/bin
-            )
-            IF (NOT CEGUI_SCRIPT_LIBDIR)
-                SET(CEGUI_SCRIPT_LIBRARIES)
-            ENDIF (NOT CEGUI_SCRIPT_LIBDIR)
-        ENDIF (NOT CEGUI_SCRIPT_LIBDIR)
-    ENDIF (NOT CEGUI_SCRIPT_LIBDIR)
+#    IF (NOT CEGUI_SCRIPT_LIBDIR)
+#        # Search Lua script module
+#        SET(CEGUI_SCRIPT_LIBRARIES "CEGUILuaScriptModule")
+#        FIND_LIBRARY(CEGUI_SCRIPT_LIBDIR NAMES ${CEGUI_SCRIPT_LIBRARIES} PATHS
+#            ../libs/cegui-0.6.1/bin
+#        )
+#       IF (NOT CEGUI_SCRIPT_LIBDIR)
+#            SET(CEGUI_SCRIPT_LIBRARIES "CEGUILua")
+#            FIND_LIBRARY(CEGUI_SCRIPT_LIBDIR NAMES ${CEGUI_SCRIPT_LIBRARIES} PATHS
+#                ../libs/cegui-0.6.1/bin
+#            )
+#            IF (NOT CEGUI_SCRIPT_LIBDIR)
+#                SET(CEGUI_SCRIPT_LIBRARIES)
+#            ENDIF (NOT CEGUI_SCRIPT_LIBDIR)
+#        ENDIF (NOT CEGUI_SCRIPT_LIBDIR)
+#    ENDIF (NOT CEGUI_SCRIPT_LIBDIR)
 
-    # Strip the filename from the path
-    IF (CEGUI_SCRIPT_LIBDIR)
-        GET_FILENAME_COMPONENT(CEGUI_SCRIPT_LIBDIR ${CEGUI_SCRIPT_LIBDIR} PATH)
-        SET (CEGUI_SCRIPT_LIB_DIR ${CEGUI_SCRIPT_LIBDIR} CACHE FILEPATH "")
-    ENDIF (CEGUI_SCRIPT_LIBDIR)
+#    # Strip the filename from the path
+#    IF (CEGUI_SCRIPT_LIBDIR)
+#        GET_FILENAME_COMPONENT(CEGUI_SCRIPT_LIBDIR ${CEGUI_SCRIPT_LIBDIR} PATH)
+#        SET (CEGUI_SCRIPT_LIB_DIR ${CEGUI_SCRIPT_LIBDIR} CACHE FILEPATH "")
+#    ENDIF (CEGUI_SCRIPT_LIBDIR)
 
 ELSE (WIN32) #Unix
@@ -68 +68 @@
     SET(CEGUI_LIB_DIR ${CEGUI_LIBDIR})
     SET(CEGUI_LIBRARIES ${CEGUI_LIBRARIES} CACHE STRING "")
-    SET(CEGUI_SCRIPT_LIBRARIES "CEGUILuaScriptModule")
-    SET(CEGUI_SCRIPT_LIB_DIR)
+#    SET(CEGUI_SCRIPT_LIBRARIES "CEGUILuaScriptModule")
+#    SET(CEGUI_SCRIPT_LIB_DIR)
 ENDIF (WIN32)
 
-IF (CEGUI_INCLUDE_DIR AND CEGUI_LIBRARIES AND CEGUI_LIB_DIR AND CEGUI_SCRIPT_LIBRARIES)
+IF (CEGUI_INCLUDE_DIR AND CEGUI_LIBRARIES AND CEGUI_LIB_DIR)# AND CEGUI_SCRIPT_LIBRARIES)
     SET(CEGUI_FOUND TRUE)
 
@@ -82 +82 @@
     SET(CEGUI_LIBRARIES ${CEGUI_LIBRARIES} CACHE STRING "")
     SET(CEGUI_LIB_DIR ${CEGUI_LIB_DIR} CACHE PATH "")
-    SET(CEGUI_SCRIPT_LIBRARIES ${CEGUI_SCRIPT_LIBRARIES} CACHE PATH "")
-ENDIF (CEGUI_INCLUDE_DIR AND CEGUI_LIBRARIES AND CEGUI_LIB_DIR AND CEGUI_SCRIPT_LIBRARIES)
+#    SET(CEGUI_SCRIPT_LIBRARIES ${CEGUI_SCRIPT_LIBRARIES} CACHE PATH "")
+ENDIF (CEGUI_INCLUDE_DIR AND CEGUI_LIBRARIES AND CEGUI_LIB_DIR)# AND CEGUI_SCRIPT_LIBRARIES)
 
 IF (CEGUI_FOUND)
@@ -92 +92 @@
             MESSAGE (STATUS "  library path: ${CEGUI_LIB_DIR}")
             MESSAGE (STATUS "  libraries:    ${CEGUI_LIBRARIES}")
-            MESSAGE (STATUS "           :    ${CEGUI_SCRIPT_LIBRARIES}")
+#            MESSAGE (STATUS "           :    ${CEGUI_SCRIPT_LIBRARIES}")
         ENDIF (VERBOSE_FIND)
     ENDIF (NOT CEGUI_FIND_QUIETLY)
@@ -105 +105 @@
         MESSAGE(SEND_ERROR "CEGUI libraries not known.")
     ENDIF (NOT CEGUI_LIBRARIES)
-    IF (NOT CEGUI_SCRIPT_LIBRARIES)
-        MESSAGE(SEND_ERROR "CEGUI Lua script module was not found.")
-    ENDIF (NOT CEGUI_SCRIPT_LIBRARIES)
+#    IF (NOT CEGUI_SCRIPT_LIBRARIES)
+#        MESSAGE(SEND_ERROR "CEGUI Lua script module was not found.")
+#    ENDIF (NOT CEGUI_SCRIPT_LIBRARIES)
 ENDIF (CEGUI_FOUND)