ENH: use the standard find_package_handle_standard_args() for lua 5.0 and
5.1 Alex
This commit is contained in:
parent
70c2dc8a64
commit
ee72506471
|
@ -1,13 +1,13 @@
|
||||||
# Locate Lua library
|
# Locate Lua library
|
||||||
# This module defines
|
# This module defines
|
||||||
# LUA_LIBRARIES, both lua and lualib
|
# LUA_LIBRARIES, both lua and lualib
|
||||||
# LUA_FOUND, if false, do not try to link to Lua
|
# 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_INCLUDE_DIR, where to find lua.h and lualib.h (and probably lauxlib.h)
|
||||||
#
|
#
|
||||||
# Note that the expected include convention is
|
# Note that the expected include convention is
|
||||||
# #include "lua.h"
|
# #include "lua.h"
|
||||||
# and not
|
# and not
|
||||||
# #include <lua/lua.h>
|
# #include <lua/lua.h>
|
||||||
# This is because, the lua location is not standardized and may exist
|
# This is because, the lua location is not standardized and may exist
|
||||||
# in locations other than lua/
|
# in locations other than lua/
|
||||||
|
|
||||||
|
@ -92,9 +92,10 @@ ELSE(${LUA_LIBRARY_lua} MATCHES "framework")
|
||||||
ENDIF(${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")
|
MARK_AS_ADVANCED(LUA_INCLUDE_DIR LUA_LIBRARIES)
|
||||||
IF(LUA_LIBRARIES AND LUA_INCLUDE_DIR)
|
|
||||||
SET(LUA_FOUND "YES")
|
|
||||||
ENDIF(LUA_LIBRARIES AND LUA_INCLUDE_DIR)
|
|
||||||
|
|
||||||
|
|
|
@ -1,13 +1,13 @@
|
||||||
# Locate Lua library
|
# Locate Lua library
|
||||||
# This module defines
|
# This module defines
|
||||||
# LUA_LIBRARIES
|
# LUA_LIBRARIES
|
||||||
# LUA_FOUND, if false, do not try to link to Lua
|
# LUA_FOUND, if false, do not try to link to Lua
|
||||||
# LUA_INCLUDE_DIR, where to find lua.h
|
# LUA_INCLUDE_DIR, where to find lua.h
|
||||||
#
|
#
|
||||||
# Note that the expected include convention is
|
# Note that the expected include convention is
|
||||||
# #include "lua.h"
|
# #include "lua.h"
|
||||||
# and not
|
# and not
|
||||||
# #include <lua/lua.h>
|
# #include <lua/lua.h>
|
||||||
# This is because, the lua location is not standardized and may exist
|
# This is because, the lua location is not standardized and may exist
|
||||||
# in locations other than lua/
|
# in locations other than lua/
|
||||||
|
|
||||||
|
@ -57,16 +57,18 @@ FIND_LIBRARY(LUA_LIBRARY
|
||||||
IF(LUA_LIBRARY)
|
IF(LUA_LIBRARY)
|
||||||
# include the math library for Unix
|
# include the math library for Unix
|
||||||
IF(UNIX AND NOT APPLE)
|
IF(UNIX AND NOT APPLE)
|
||||||
FIND_LIBRARY(MATH_LIBRARY_FOR_LUA m)
|
FIND_LIBRARY(LUA_MATH_LIBRARY m)
|
||||||
SET( LUA_LIBRARIES "${LUA_LIBRARY};${MATH_LIBRARY_FOR_LUA}" CACHE STRING "Lua Libraries")
|
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
|
# For Windows and Mac, don't need to explicitly include the math library
|
||||||
ELSE(UNIX AND NOT APPLE)
|
ELSE(UNIX AND NOT APPLE)
|
||||||
SET( LUA_LIBRARIES "${LUA_LIBRARY}" CACHE STRING "Lua Libraries")
|
SET( LUA_LIBRARIES "${LUA_LIBRARY}" CACHE STRING "Lua Libraries")
|
||||||
ENDIF(UNIX AND NOT APPLE)
|
ENDIF(UNIX AND NOT APPLE)
|
||||||
ENDIF(LUA_LIBRARY)
|
ENDIF(LUA_LIBRARY)
|
||||||
|
|
||||||
SET(LUA_FOUND "NO")
|
INCLUDE(FindPackageHandleStandardArgs)
|
||||||
IF(LUA_LIBRARIES AND LUA_INCLUDE_DIR)
|
# handle the QUIETLY and REQUIRED arguments and set LUA_FOUND to TRUE if
|
||||||
SET(LUA_FOUND "YES")
|
# all listed variables are TRUE
|
||||||
ENDIF(LUA_LIBRARIES AND LUA_INCLUDE_DIR)
|
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)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue