From 7ebe6de02263600ffec038e43cc1a2908d16cc62 Mon Sep 17 00:00:00 2001 From: DennisOSRM Date: Wed, 3 Jul 2013 13:46:55 +0200 Subject: [PATCH] Proper check for luajit --- CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0f40e00cc..466226103 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -80,16 +80,16 @@ find_package( Threads REQUIRED ) target_link_libraries (osrm-extract ${Threads_LIBRARY}) find_package( LuaJIT ) -IF(LUAJIT_LIBRARIES) +IF( LUAJIT_INCLUDE_DIR AND 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 ) +ELSE( LUAJIT_INCLUDE_DIR ) + find_package( Lua51 REQUIRED AND LUAJIT_LIBRARIES ) include_directories(${LUA_INCLUDE_DIR}) target_link_libraries( osrm-extract ${LUA_LIBRARY} ) target_link_libraries( osrm-prepare ${LUA_LIBRARY} ) -ENDIF(LUAJIT_LIBRARIES) +ENDIF( LUAJIT_INCLUDE_DIR AND LUAJIT_LIBRARIES ) find_package( LibXml2 REQUIRED ) include_directories(${LIBXML2_INCLUDE_DIR})