Use LuaJIT if available
This commit is contained in:
		
							parent
							
								
									2c3f05e6f1
								
							
						
					
					
						commit
						3119e4b82b
					
				| @ -70,10 +70,17 @@ target_link_libraries (osrm-routed ${ZLIB_LIBRARY}) | ||||
| find_package( Threads REQUIRED ) | ||||
| target_link_libraries (osrm-extract ${Threads_LIBRARY}) | ||||
| 
 | ||||
| find_package( Lua51 REQUIRED )  | ||||
| include_directories(${LUA_INCLUDE_DIR}) | ||||
| target_link_libraries( osrm-extract ${LUA_LIBRARY} ) | ||||
| target_link_libraries( osrm-prepare ${LUA_LIBRARY} ) | ||||
| find_package( LuaJIT )  | ||||
| IF(LUAJIT_LIBRARIES) | ||||
| 	include_directories(${LUAJIT_INCLUDE_DIR}) | ||||
| 	target_link_libraries( osrm-extract ${LUAJIT_LIBRARIES} ) | ||||
| 	target_link_libraries( osrm-prepare ${LUAJIT_LIBRARIES} ) | ||||
| ELSE(LUAJIT_LIBRARIES) | ||||
| 	find_package( Lua51 REQUIRED )  | ||||
| 	include_directories(${LUA_INCLUDE_DIR}) | ||||
| 	target_link_libraries( osrm-extract ${LUA_LIBRARY} ) | ||||
| 	target_link_libraries( osrm-prepare ${LUA_LIBRARY} ) | ||||
| ENDIF(LUAJIT_LIBRARIES) | ||||
| 
 | ||||
| find_package( LibXml2 REQUIRED ) | ||||
| include_directories(${LIBXML2_INCLUDE_DIR}) | ||||
|  | ||||
							
								
								
									
										86
									
								
								cmake/FindLuaJIT.cmake
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										86
									
								
								cmake/FindLuaJIT.cmake
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,86 @@ | ||||
| # 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 <lua/lua.h> | ||||
| # 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_QUIETLY ) | ||||
|     MESSAGE(STATUS "Looking for LuaJIT...") | ||||
| 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-51 luajit-5.1 luajit | ||||
|   HINTS | ||||
|   $ENV{LUAJIT_DIR} | ||||
|   PATH_SUFFIXES lib64 lib | ||||
|   PATHS | ||||
|   ~/Library/Frameworks | ||||
|   /Library/Frameworks | ||||
|   /usr/local | ||||
|   /usr | ||||
|   /sw | ||||
|   /opt/local | ||||
|   /opt/csw | ||||
|   /opt | ||||
| ) | ||||
| 
 | ||||
|   # 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 ) | ||||
|         MESSAGE(STATUS "Found LuaJIT: ${LUAJIT_LIBRARY}" ) | ||||
|     ENDIF() | ||||
| ENDIF() | ||||
| MARK_AS_ADVANCED(LUAJIT_INCLUDE_DIR LUAJIT_LIBRARIES LUAJIT_LIBRARY LUAJIT_MATH_LIBRARY) | ||||
		Loading…
	
		Reference in New Issue
	
	Block a user