Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

fix linking on Ubuntu 13.10

Browse Source
This commit is contained in:
DennisOSRM 2013-11-20 16:22:39 +01:00
parent b06db1ba39
commit 7de27df309
2 changed files with 40 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
CMakeLists.txt
View File

@ -138,20 +138,27 @@ target_link_libraries (osrm-routed ${ZLIB_LIBRARY})
find_package( Threads REQUIRED ) find_package( Threads REQUIRED )
target_link_libraries (osrm-extract ${Threads_LIBRARY}) target_link_libraries (osrm-extract ${Threads_LIBRARY})
find_package( LuaJIT ) find_package( Lua52 )
IF( NOT APPLE AND LUAJIT_INCLUDE_DIR AND LUAJIT_LIBRARIES ) IF ( NOT LUA52_FOUND )
include_directories(${LUAJIT_INCLUDE_DIR}) find_package( Lua51 REQUIRED )
target_link_libraries( osrm-extract ${LUAJIT_LIBRARIES} ) IF (NOT APPLE)
target_link_libraries( osrm-prepare ${LUAJIT_LIBRARIES} ) find_package( LuaJIT 5.1 )
ELSE( NOT APPLE AND LUAJIT_INCLUDE_DIR AND LUAJIT_LIBRARIES ) ENDIF ( NOT APPLE )
find_package( Lua52 ) ELSE( NOT LUA52_FOUND )
IF ( NOT LUA52_FOUND ) IF(NOT APPLE)
find_package( Lua51 REQUIRED AND LUAJIT_LIBRARIES ) find_package( LuaJIT 5.2 )
ENDIF ( NOT LUA52_FOUND ) ENDIF(NOT APPLE)
include_directories(${LUA_INCLUDE_DIR}) ENDIF( NOT LUA52_FOUND )
target_link_libraries( osrm-extract ${LUA_LIBRARY} )
target_link_libraries( osrm-prepare ${LUA_LIBRARY} ) IF ( LUAJIT_FOUND )
ENDIF( NOT APPLE AND LUAJIT_INCLUDE_DIR AND LUAJIT_LIBRARIES ) target_link_libraries( osrm-extract ${LUAJIT_LIBRARIES} )
target_link_libraries( osrm-prepare ${LUAJIT_LIBRARIES} )
ELSE ()
target_link_libraries( osrm-extract ${LUA_LIBRARY} )
target_link_libraries( osrm-prepare ${LUA_LIBRARY} )
ENDIF ()
include_directories(${LUA_INCLUDE_DIR})
find_package( LibXml2 REQUIRED ) find_package( LibXml2 REQUIRED )
include_directories(${LIBXML2_INCLUDE_DIR}) include_directories(${LIBXML2_INCLUDE_DIR})

31
cmake/FindLuaJIT.cmake
View File

@ -1,8 +1,8 @@
# Locate Lua library # Locate Lua library
# This module defines # This module defines
# LUAJIT_FOUND, if false, do not try to link to Lua # LUAJIT_FOUND, if false, do not try to link to Lua
# LUAJIT_LIBRARIES # LUAJIT_LIBRARIES
# LUAJIT_INCLUDE_DIR, where to find lua.h # LUAJIT_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"
@ -28,8 +28,12 @@
# 2010 - modified for cronkite to find luajit instead of lua, as it was before. # 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 ) IF( NOT LUAJIT_FIND_QUIETLY )
MESSAGE(STATUS "Looking for LuaJIT...") MESSAGE(STATUS "Looking for LuaJIT ${LuaJIT_FIND_VERSION}")
ENDIF() ENDIF()
FIND_PATH(LUAJIT_INCLUDE_DIR lua.h FIND_PATH(LUAJIT_INCLUDE_DIR lua.h
@ -47,8 +51,8 @@ FIND_PATH(LUAJIT_INCLUDE_DIR lua.h
/opt /opt
) )
FIND_LIBRARY(LUAJIT_LIBRARY FIND_LIBRARY(LUAJIT_LIBRARY
NAMES luajit-51 luajit-5.1 luajit NAMES luajit-${LuaJIT_FIND_VERSION_MAJOR}${LuaJIT_FIND_VERSION_MINOR} luajit-${LuaJIT_FIND_VERSION}
HINTS HINTS
$ENV{LUAJIT_DIR} $ENV{LUAJIT_DIR}
PATH_SUFFIXES lib64 lib PATH_SUFFIXES lib64 lib
@ -63,6 +67,7 @@ FIND_LIBRARY(LUAJIT_LIBRARY
/opt /opt
) )
IF(LUAJIT_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(LUAJIT_MATH_LIBRARY m) FIND_LIBRARY(LUAJIT_MATH_LIBRARY m)
@ -71,16 +76,18 @@ FIND_LIBRARY(LUAJIT_LIBRARY
ELSE(UNIX AND NOT APPLE) ELSE(UNIX AND NOT APPLE)
SET( LUAJIT_LIBRARIES "${LUAJIT_LIBRARY}" CACHE STRING "Lua Libraries") SET( LUAJIT_LIBRARIES "${LUAJIT_LIBRARY}" CACHE STRING "Lua Libraries")
ENDIF(UNIX AND NOT APPLE) ENDIF(UNIX AND NOT APPLE)
#ENDIF(LUAJIT_LIBRARY) ENDIF(LUAJIT_LIBRARY)
INCLUDE(FindPackageHandleStandardArgs) INCLUDE(FindPackageHandleStandardArgs)
# handle the QUIETLY and REQUIRED arguments and set LUAJIT_FOUND to TRUE if # handle the QUIETLY and REQUIRED arguments and set LUAJIT_FOUND to TRUE if
# all listed variables are TRUE # all listed variables are TRUE
FIND_PACKAGE_HANDLE_STANDARD_ARGS(LuaJIT DEFAULT_MSG LUAJIT_LIBRARIES LUAJIT_INCLUDE_DIR) FIND_PACKAGE_HANDLE_STANDARD_ARGS(LUAJIT DEFAULT_MSG LUAJIT_LIBRARIES LUAJIT_INCLUDE_DIR)
IF( NOT LUAJIT_FIND_QUIETLY ) IF( NOT LUAJIT_FIND_QUIETLY )
IF( LUAJIT_FOUND ) IF( LUAJIT_FOUND AND LUAJIT_LIBRARIES)
MESSAGE(STATUS "Found LuaJIT: ${LUAJIT_LIBRARY}" ) MESSAGE(STATUS "Found LuaJIT: ${LUAJIT_LIBRARY}" )
ENDIF() MARK_AS_ADVANCED(LUAJIT_INCLUDE_DIR LUAJIT_LIBRARIES LUAJIT_LIBRARY LUAJIT_MATH_LIBRARY)
ELSE()
SET ( LUAJIT_FOUND FALSE )
ENDIF()
ENDIF() ENDIF()
MARK_AS_ADVANCED(LUAJIT_INCLUDE_DIR LUAJIT_LIBRARIES LUAJIT_LIBRARY LUAJIT_MATH_LIBRARY)