fix in cmake configuration for LuaJIT and OpenGL ES

src/framework/CMakeLists.txt

@@ -75,6 +75,8 @@ MESSAGE(STATUS "OpenGL ES: " ${OPENGLES})
 
 IF(LUAJIT)
     FIND_PACKAGE(LuaJIT REQUIRED)
+    SET(LUA_INCLUDE_DIR ${LUAJIT_INCLUDE_DIR})
+    SET(LUA_LIBRARIES ${LUAJIT_LIBRARIES})
 ELSE()
     FIND_PACKAGE(Lua REQUIRED)
 ENDIF()

src/framework/cmake/FindLuaJIT.cmake

@@ -1,22 +1,14 @@
 # Try to find the lua librairy
-#  LUA_FOUND - system has lua
-#  LUA_INCLUDE_DIR - the lua include directory
-#  LUA_LIBRARY - the lua library
-#  LUA_LIBRARIES - the lua library and it's dependencies
+#  LUAJIT_FOUND - system has lua
+#  LUAJIT_INCLUDE_DIR - the lua include directory
+#  LUAJIT_LIBRARY - the lua library
+#  LUAJIT_LIBRARIES - the lua library and it's dependencies
 
-FIND_PATH(LUA_INCLUDE_DIR NAMES lua.h PATH_SUFFIXES luajit-2.0)
-FIND_LIBRARY(LUA_LIBRARY NAMES libluajit51.a libluajit5.1.a libluajit-5.1.a libluajit.a luajit51 luajit5.1 luajit-5.1 luajit)
-
-IF(LUA_LIBRARY)
-  IF(UNIX AND NOT APPLE)
-    FIND_LIBRARY(LUA_MATH_LIBRARY m)
-    SET(LUA_LIBRARIES "${LUA_LIBRARY};${LUA_MATH_LIBRARY}")
-  ELSE(UNIX AND NOT APPLE)
-    SET(LUA_LIBRARIES "${LUA_LIBRARY}")
-  ENDIF(UNIX AND NOT APPLE)
-ENDIF(LUA_LIBRARY)
+FIND_PATH(LUAJIT_INCLUDE_DIR NAMES lua.h PATH_SUFFIXES luajit-2.0)
+FIND_LIBRARY(LUAJIT_LIBRARY NAMES libluajit51.a libluajit5.1.a libluajit-5.1.a libluajit.a luajit51 luajit5.1 luajit-5.1 luajit)
+SET(LUAJIT_LIBRARIES "${LUAJIT_LIBRARY}")
 
 INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(LuaJIT DEFAULT_MSG LUA_LIBRARIES LUA_INCLUDE_DIR)
-MARK_AS_ADVANCED(LUA_INCLUDE_DIR LUA_LIBRARIES LUA_LIBRARY LUA_MATH_LIBRARY)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(LuaJIT DEFAULT_MSG LUAJIT_LIBRARIES LUAJIT_INCLUDE_DIR)
+MARK_AS_ADVANCED(LUAJIT_INCLUDE_DIR LUAJIT_LIBRARIES LUAJIT_LIBRARY)
 

src/framework/cmake/FindOpenGLES1.cmake

@@ -4,7 +4,7 @@
 #  OPENGLES1_LIBRARY - the OpenGL ES 1.0 library
 
 FIND_PATH(OPENGLES1_INCLUDE_DIR NAMES GLES/gl.h)
-FIND_LIBRARY(OPENGLES1_LIBRARY NAMES GLESv1_CM)
+FIND_LIBRARY(OPENGLES1_LIBRARY NAMES GLESv1_CM GLES_CM)
 INCLUDE(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenGLES2 DEFAULT_MSG OPENGLES1_LIBRARY OPENGLES1_INCLUDE_DIR)
 MARK_AS_ADVANCED(OPENGLES1_LIBRARY OPENGLES1_INCLUDE_DIR)