A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid
[simgrid.git]
/
tools
/
cmake
/
Modules
/
FindLuaSimgrid.cmake
diff --git
a/tools/cmake/Modules/FindLuaSimgrid.cmake
b/tools/cmake/Modules/FindLuaSimgrid.cmake
index
cc27338
..
1ac9d00
100644
(file)
--- a/
tools/cmake/Modules/FindLuaSimgrid.cmake
+++ b/
tools/cmake/Modules/FindLuaSimgrid.cmake
@@
-3,7
+3,7
@@
# Input variable:
# LUA_HINT: path to Lua installation -- only needed for non-standard installs
# Output variable:
# Input variable:
# LUA_HINT: path to Lua installation -- only needed for non-standard installs
# Output variable:
-# HAVE_LUA : if Lua was found
+#
SIMGRID_
HAVE_LUA : if Lua was found
# LUA_LIBRARY : the path to the dynamic library
# LUA_INCLUDE_DIR : where to find lua.h
# LUA_VERSION_MAJOR: First part of the version (often, 5)
# LUA_LIBRARY : the path to the dynamic library
# LUA_INCLUDE_DIR : where to find lua.h
# LUA_VERSION_MAJOR: First part of the version (often, 5)
@@
-23,7
+23,12
@@
find_path(LUA_INCLUDE_DIR lua.h
)
find_library(LUA_LIBRARY
)
find_library(LUA_LIBRARY
- NAMES lua53 lua5.3 lua-5.3 lua
+ NAMES # I don't want a lua.a
+ lua53.so lua5.3.so lua-5.3.so
+ lua53.dynlib lua5.3.dynlib lua-5.3.dynlib
+ lua53.dll lua5.3.dll lua-5.3.dll
+ lua.so lua.dynlib lua.dll
+ lua53 lua5.3 lua-5.3 lua
HINTS
ENV LUA_HINT
PATH_SUFFIXES lib
HINTS
ENV LUA_HINT
PATH_SUFFIXES lib
@@
-51,8
+56,7
@@
unset(lua_version_str)
# Check that we have a sufficient version of Lua
if(LUA_VERSION_MAJOR EQUAL 5 AND LUA_VERSION_MINOR EQUAL 3)
# Check that we have a sufficient version of Lua
if(LUA_VERSION_MAJOR EQUAL 5 AND LUA_VERSION_MINOR EQUAL 3)
- set(HAVE_LUA 1)
-
+ set(SIMGRID_HAVE_LUA 1)
include_directories(${LUA_INCLUDE_DIR})
else()
message(FATAL_ERROR "Error: Lua version 5.3 is required, but version ${LUA_VERSION_MAJOR}.${LUA_VERSION_MINOR} found instead.")
include_directories(${LUA_INCLUDE_DIR})
else()
message(FATAL_ERROR "Error: Lua version 5.3 is required, but version ${LUA_VERSION_MAJOR}.${LUA_VERSION_MINOR} found instead.")
@@
-60,3
+64,5
@@
endif()
message(STATUS "Lua version: ${LUA_VERSION_MAJOR}.${LUA_VERSION_MINOR}")
message(STATUS "Lua library: ${LUA_LIBRARY}")
message(STATUS "Lua version: ${LUA_VERSION_MAJOR}.${LUA_VERSION_MINOR}")
message(STATUS "Lua library: ${LUA_LIBRARY}")
+mark_as_advanced(LUA_INCLUDE_DIR)
+mark_as_advanced(LUA_LIBRARY)