From eafe3fa928ce5bdade7f124d4d96357d23e4f18e Mon Sep 17 00:00:00 2001 From: karenzshea Date: Tue, 27 Sep 2016 13:55:55 -0400 Subject: [PATCH] remove luajit support --- CMakeLists.txt | 3 -- cmake/FindLuaJIT.cmake | 93 --------------------------------------- cmake/check_luabind.cmake | 6 --- 3 files changed, 102 deletions(-) delete mode 100644 cmake/FindLuaJIT.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index d51b81c16..65b1fea19 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -307,9 +307,6 @@ include(check_luabind) add_dependency_includes(${LUABIND_INCLUDE_DIR}) set(USED_LUA_LIBRARIES ${LUA_LIBRARY}) -if(LUAJIT_FOUND) - set(USED_LUA_LIBRARIES, LUAJIT_LIBRARIES) -endif() add_dependency_includes(${LUA_INCLUDE_DIR}) find_package(EXPAT REQUIRED) diff --git a/cmake/FindLuaJIT.cmake b/cmake/FindLuaJIT.cmake deleted file mode 100644 index 5d5e6aceb..000000000 --- a/cmake/FindLuaJIT.cmake +++ /dev/null @@ -1,93 +0,0 @@ -# Locate Lua library -# This module defines -# LUAJIT_FOUND, if false, do not try to link to Lua -# LUAJIT_LIBRARIES -# LUAJIT_INCLUDE_DIR, where to find lua.h -# -# Note that the expected include convention is -# #include "lua.h" -# and not -# #include -# This is because, the lua location is not standardized and may exist -# in locations other than lua/ - -#============================================================================= -# Copyright 2007-2009 Kitware, Inc. -# -# Distributed under the OSI-approved BSD License (the "License"); -# see accompanying file Copyright.txt for details. -# -# This software is distributed WITHOUT ANY WARRANTY; without even the -# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# See the License for more information. -#============================================================================= -# (To distributed this file outside of CMake, substitute the full -# License text for the above reference.) -# -# ################ -# 2010 - modified for cronkite to find luajit instead of lua, as it was before. -# - -if ( NOT LuaJIT_FIND_VERSION ) - MESSAGE(FATAL_ERROR "You need to specify a version of libluajit to use") -ENDIF() - -IF( NOT LUAJIT_FIND_QUIETLY ) - MESSAGE(STATUS "Looking for LuaJIT ${LuaJIT_FIND_VERSION}") -ENDIF() - -FIND_PATH(LUAJIT_INCLUDE_DIR lua.h - HINTS - $ENV{LUAJIT_DIR} - PATH_SUFFIXES include/luajit-2.0 include/luajit2.0 include/luajit include - PATHS - ~/Library/Frameworks - /Library/Frameworks - /usr/local - /usr - /sw # Fink - /opt/local # DarwinPorts - /opt/csw # Blastwave - /opt -) - -FIND_LIBRARY(LUAJIT_LIBRARY - NAMES luajit-${LuaJIT_FIND_VERSION_MAJOR}${LuaJIT_FIND_VERSION_MINOR} luajit-${LuaJIT_FIND_VERSION} - HINTS - $ENV{LUAJIT_DIR} - PATH_SUFFIXES lib64 lib - PATHS - ~/Library/Frameworks - /Library/Frameworks - /usr/local - /usr - /sw - /opt/local - /opt/csw - /opt -) - -IF(LUAJIT_LIBRARY) - # include the math library for Unix - IF(UNIX AND NOT APPLE) - FIND_LIBRARY(LUAJIT_MATH_LIBRARY m) - SET( LUAJIT_LIBRARIES "${LUAJIT_LIBRARY};${LUAJIT_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( LUAJIT_LIBRARIES "${LUAJIT_LIBRARY}" CACHE STRING "Lua Libraries") - ENDIF(UNIX AND NOT APPLE) -ENDIF(LUAJIT_LIBRARY) - -INCLUDE(FindPackageHandleStandardArgs) -# handle the QUIETLY and REQUIRED arguments and set LUAJIT_FOUND to TRUE if -# all listed variables are TRUE -FIND_PACKAGE_HANDLE_STANDARD_ARGS(LUAJIT DEFAULT_MSG LUAJIT_LIBRARIES LUAJIT_INCLUDE_DIR) - -IF( NOT LUAJIT_FIND_QUIETLY ) - IF( LUAJIT_FOUND AND LUAJIT_LIBRARIES) - MESSAGE(STATUS "Found LuaJIT: ${LUAJIT_LIBRARY}" ) - MARK_AS_ADVANCED(LUAJIT_INCLUDE_DIR LUAJIT_LIBRARIES LUAJIT_LIBRARY LUAJIT_MATH_LIBRARY) - ELSE() - SET ( LUAJIT_FOUND FALSE ) - ENDIF() -ENDIF() diff --git a/cmake/check_luabind.cmake b/cmake/check_luabind.cmake index 79253af2b..5284e660a 100644 --- a/cmake/check_luabind.cmake +++ b/cmake/check_luabind.cmake @@ -7,9 +7,6 @@ set (CMAKE_REQUIRED_INCLUDES "${Boost_INCLUDE_DIR};${LUABIND_INCLUDE_DIR};${LUA_ set (CMAKE_REQUIRED_LIBRARIES "${LUABIND_LIBRARY};${LUA_LIBRARY}") find_package(Lua52) -if(NOT APPLE) - find_package(LuaJIT 5.2) -endif() if(LUA52_FOUND) set (CMAKE_REQUIRED_INCLUDES "${Boost_INCLUDE_DIR};${LUABIND_INCLUDE_DIR};${LUA_INCLUDE_DIR}") set (CMAKE_REQUIRED_LIBRARIES "${LUABIND_LIBRARY};${LUA_LIBRARY}") @@ -24,9 +21,6 @@ else() unset(LUA_INCLUDE_DIR CACHE) unset(LUA_LIBRARY CACHE) find_package(Lua51 REQUIRED) - if(NOT APPLE) - find_package(LuaJIT 5.1) - endif() set (CMAKE_REQUIRED_INCLUDES "${Boost_INCLUDE_DIR};${LUABIND_INCLUDE_DIR};${LUA_INCLUDE_DIR}") set (CMAKE_REQUIRED_LIBRARIES "${LUABIND_LIBRARY};${LUA_LIBRARY}")