Changeset 1776 for code/trunk/cmake/FindLua.cmake

Timestamp:

Sep 13, 2008, 9:32:44 PM (16 years ago)

Author:

landauf

Message:

Many changes in almost all FindXYZ.cmake files. They now throw errors if something wasn't found.

File:

• code/trunk/cmake/FindLua.cmake (modified) (7 diffs)

code/trunk/cmake/FindLua.cmake

@@ -8 +8 @@
 #
 #  authors: Benjamin Knecht, Reto Grieder
+#
+# Several changes and additions by Fabian 'x3n' Landau
+#                 > www.orxonox.net <
 
 IF (Lua_LIBRARIES AND Lua_INCLUDE_DIR)
@@ -14 +17 @@
   SET(Lua_FOUND TRUE)
   SET(Lua_FIND_QUIETLY TRUE) 
-  MESSAGE(STATUS "Lua was found.")
+#  MESSAGE(STATUS "Lua was found.")
 
 ELSE (Lua_LIBRARIES AND Lua_INCLUDE_DIR)
@@ -21 +24 @@
     /usr/include/lua5.1
     /usr/local/include/lua5.1
-    ../libs/lua-5.1.3/src)
+    ../libs/lua-5.1.3/include)
 
   FIND_PATH(Lua_INCLUDE_DIR_50 lua.h
@@ -34 +37 @@
 
   FIND_LIBRARY(Lua_LIBRARY_1_50 NAMES lua50 lua PATHS
-        /usr/pack/lua-5.0.3-sd/i686-debian-linux3.1/lib #tardis
+    /usr/pack/lua-5.0.3-sd/i686-debian-linux3.1/lib #tardis
     /usr/lib
     /usr/local/lib)
 
   FIND_LIBRARY(Lua_LIBRARY_2_50 NAMES lualib50 lualib PATHS
-        /usr/pack/lua-5.0.3-sd/i686-debian-linux3.1/lib #tardis
+    /usr/pack/lua-5.0.3-sd/i686-debian-linux3.1/lib #tardis
     /usr/lib
     /usr/local/lib)
@@ -51 +54 @@
     SET(Lua_INCLUDE_DIR ${Lua_INCLUDE_DIR_51} CACHE PATH "")
     SET(Lua_LIBRARIES ${Lua_LIBRARY_51} CACHE FILEPATH "")
+    SET(Lua_LIBRARY_NAMES "lua5.1 lua")
 
   ELSEIF(Lua_INCLUDE_DIR_50 AND Lua_LIBRARY_1_50 AND Lua_LIBRARY_2_50)
@@ -59 +63 @@
     SET(Lua_INCLUDE_DIR ${Lua_INCLUDE_DIR_50} CACHE PATH "")
     SET(Lua_LIBRARIES ${Lua_LIBRARY_1_50} ${Lua_LIBRARY_2_50} CACHE FILEPATH "")
+    SET(Lua_LIBRARY_NAMES "lua50 lua, lualib50 lualib")
 
   ENDIF (Lua_INCLUDE_DIR_51 AND Lua_LIBRARY_51)
@@ -64 +69 @@
 
   IF (Lua_FOUND)
-    MESSAGE(STATUS "Found Lua: ${Lua_LIBRARIES}")
+    MESSAGE(STATUS "Lua was found.")
+    IF (VERBOSE_FIND)
+      MESSAGE (STATUS "  include path: ${Lua_INCLUDE_DIR}")
+      MESSAGE (STATUS "  library path: ${Lua_LIBRARIES}")
+      MESSAGE (STATUS "  libraries:    ${Lua_LIBRARY_NAMES}")
+    ENDIF (VERBOSE_FIND)
   ELSE (Lua_FOUND)
-    IF (Lua_FIND_REQUIRED)
-      MESSAGE(FATAL_ERROR "Could not find Lua")
-    ENDIF (Lua_FIND_REQUIRED)
+    IF (Lua_INCLUDE_DIR_51 AND NOT Lua_LIBRARY_51)
+      MESSAGE(SEND_ERROR "Lua 5.1 library was not found")
+    ENDIF (Lua_INCLUDE_DIR_51 AND NOT Lua_LIBRARY_51)
+    IF (NOT Lua_INCLUDE_DIR_51 AND Lua_LIBRARY_51)
+      MESSAGE(SEND_ERROR "Lua 5.1 include path was not found")
+    ENDIF (NOT Lua_INCLUDE_DIR_51 AND Lua_LIBRARY_51)
+
+    IF (Lua_INCLUDE_DIR_50)
+      IF (NOT Lua_LIBRARY_1_50)
+       MESSAGE(SEND_ERROR "Lua 5.0 library "lua" was not found")
+      ENDIF (NOT Lua_LIBRARY_1_50)
+      IF (NOT Lua_LIBRARY_2_50)
+       MESSAGE(SEND_ERROR "Lua 5.0 library "lualib" was not found")
+      ENDIF (NOT Lua_LIBRARY_2_50)
+    ENDIF (Lua_INCLUDE_DIR_50)
+    IF (NOT Lua_INCLUDE_DIR_50 AND Lua_LIBRARY_1_50 AND Lua_LIBRARY_2_50)
+      MESSAGE(SEND_ERROR "Lua 5.0 include path was not found")
+    ENDIF (NOT Lua_INCLUDE_DIR_50 AND Lua_LIBRARY_1_50 AND Lua_LIBRARY_2_50)
+
+    MESSAGE(SEND_ERROR "Lua was not found.")
   ENDIF (Lua_FOUND)