summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorAlexander Neundorf <neundorf@kde.org>2008-03-10 17:26:11 (GMT)
committerAlexander Neundorf <neundorf@kde.org>2008-03-10 17:26:11 (GMT)
commitee72506471859d62e2ef9f76ea44bda8e316e78d (patch)
tree7c4e53d22f119aec7cf910889f43c9b8309579ca /Modules
parent70c2dc8a64505d2cb6b3914dff966ea008865028 (diff)
downloadCMake-ee72506471859d62e2ef9f76ea44bda8e316e78d.zip
CMake-ee72506471859d62e2ef9f76ea44bda8e316e78d.tar.gz
CMake-ee72506471859d62e2ef9f76ea44bda8e316e78d.tar.bz2
ENH: use the standard find_package_handle_standard_args() for lua 5.0 and
5.1 Alex
Diffstat (limited to 'Modules')
-rw-r--r--Modules/FindLua50.cmake19
-rw-r--r--Modules/FindLua51.cmake24
2 files changed, 23 insertions, 20 deletions
diff --git a/Modules/FindLua50.cmake b/Modules/FindLua50.cmake
index 0b03530..dce4837 100644
--- a/Modules/FindLua50.cmake
+++ b/Modules/FindLua50.cmake
@@ -1,13 +1,13 @@
# Locate Lua library
# This module defines
-# LUA_LIBRARIES, both lua and lualib
-# LUA_FOUND, if false, do not try to link to Lua
-# LUA_INCLUDE_DIR, where to find lua.h and lualib.h (and probably lauxlib.h)
+# LUA_LIBRARIES, both lua and lualib
+# LUA_FOUND, if false, do not try to link to Lua
+# LUA_INCLUDE_DIR, where to find lua.h and lualib.h (and probably lauxlib.h)
#
# Note that the expected include convention is
-# #include "lua.h"
+# #include "lua.h"
# and not
-# #include <lua/lua.h>
+# #include <lua/lua.h>
# This is because, the lua location is not standardized and may exist
# in locations other than lua/
@@ -92,9 +92,10 @@ ELSE(${LUA_LIBRARY_lua} MATCHES "framework")
ENDIF(${LUA_LIBRARY_lua} MATCHES "framework")
+INCLUDE(FindPackageHandleStandardArgs)
+# handle the QUIETLY and REQUIRED arguments and set LUA_FOUND to TRUE if
+# all listed variables are TRUE
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(Lua50 DEFAULT_MSG LUA_LIBRARIES LUA_INCLUDE_DIR)
-SET(LUA_FOUND "NO")
-IF(LUA_LIBRARIES AND LUA_INCLUDE_DIR)
- SET(LUA_FOUND "YES")
-ENDIF(LUA_LIBRARIES AND LUA_INCLUDE_DIR)
+MARK_AS_ADVANCED(LUA_INCLUDE_DIR LUA_LIBRARIES)
diff --git a/Modules/FindLua51.cmake b/Modules/FindLua51.cmake
index 14a12fc..0a82e8c 100644
--- a/Modules/FindLua51.cmake
+++ b/Modules/FindLua51.cmake
@@ -1,13 +1,13 @@
# Locate Lua library
# This module defines
-# LUA_LIBRARIES
-# LUA_FOUND, if false, do not try to link to Lua
-# LUA_INCLUDE_DIR, where to find lua.h
+# LUA_LIBRARIES
+# LUA_FOUND, if false, do not try to link to Lua
+# LUA_INCLUDE_DIR, where to find lua.h
#
# Note that the expected include convention is
-# #include "lua.h"
+# #include "lua.h"
# and not
-# #include <lua/lua.h>
+# #include <lua/lua.h>
# This is because, the lua location is not standardized and may exist
# in locations other than lua/
@@ -57,16 +57,18 @@ FIND_LIBRARY(LUA_LIBRARY
IF(LUA_LIBRARY)
# include the math library for Unix
IF(UNIX AND NOT APPLE)
- FIND_LIBRARY(MATH_LIBRARY_FOR_LUA m)
- SET( LUA_LIBRARIES "${LUA_LIBRARY};${MATH_LIBRARY_FOR_LUA}" CACHE STRING "Lua Libraries")
+ FIND_LIBRARY(LUA_MATH_LIBRARY m)
+ SET( LUA_LIBRARIES "${LUA_LIBRARY};${LUA_MATH_LIBRARY}" CACHE STRING "Lua Libraries")
# For Windows and Mac, don't need to explicitly include the math library
ELSE(UNIX AND NOT APPLE)
SET( LUA_LIBRARIES "${LUA_LIBRARY}" CACHE STRING "Lua Libraries")
ENDIF(UNIX AND NOT APPLE)
ENDIF(LUA_LIBRARY)
-SET(LUA_FOUND "NO")
-IF(LUA_LIBRARIES AND LUA_INCLUDE_DIR)
- SET(LUA_FOUND "YES")
-ENDIF(LUA_LIBRARIES AND LUA_INCLUDE_DIR)
+INCLUDE(FindPackageHandleStandardArgs)
+# handle the QUIETLY and REQUIRED arguments and set LUA_FOUND to TRUE if
+# all listed variables are TRUE
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(Lua50 DEFAULT_MSG LUA_LIBRARIES LUA_INCLUDE_DIR)
+
+MARK_AS_ADVANCED(LUA_INCLUDE_DIR LUA_LIBRARIES LUA_LIBRARY LUA_MATH_LIBRARY)